diff options
| author | Ken Dreyer <ktdreyer@ktdreyer.com> | 2014-03-14 10:18:41 -0600 |
|---|---|---|
| committer | Ken Dreyer <ktdreyer@ktdreyer.com> | 2014-03-14 10:18:57 -0600 |
| commit | 07a4d38162f2718884c4d9462d169b1b7ab0b7c5 (patch) | |
| tree | 5b0ef4a530a4a91ffd451335fcf5a48623f86405 /xbmc-13.0-dvdread.patch | |
| parent | ad2fa8bf32377efe6d56e8a154677ce160d108f1 (diff) | |
| download | xbmc-rpm-07a4d38162f2718884c4d9462d169b1b7ab0b7c5.tar.gz xbmc-rpm-07a4d38162f2718884c4d9462d169b1b7ab0b7c5.tar.xz xbmc-rpm-07a4d38162f2718884c4d9462d169b1b7ab0b7c5.zip | |
Update to Gotham beta 1
- Update Goom/MySQL patch, per RHBZ #1069079
Diffstat (limited to 'xbmc-13.0-dvdread.patch')
| -rw-r--r-- | xbmc-13.0-dvdread.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch index 4a87b6d..27097ac 100644 --- a/xbmc-13.0-dvdread.patch +++ b/xbmc-13.0-dvdread.patch @@ -1,4 +1,4 @@ -From d04be10106d05c87a81cb1d886703bed1963a3d7 Mon Sep 17 00:00:00 2001 +From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001 From: Ken Dreyer <ktdreyer@ktdreyer.com> Date: Mon, 6 May 2013 17:07:40 -0600 Subject: [PATCH 1/3] Fedora: use external dvdread @@ -7,9 +7,9 @@ Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) --- bootstrap.mk | 5 ----- - configure.in | 22 +--------------------- + configure.in | 19 ------------------- lib/libdvd/Makefile.in | 20 +++++++------------- - 3 files changed, 8 insertions(+), 39 deletions(-) + 3 files changed, 7 insertions(+), 37 deletions(-) diff --git a/bootstrap.mk b/bootstrap.mk index 8bc4795..1fc31a4 100644 @@ -35,10 +35,10 @@ index 8bc4795..1fc31a4 100644 autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache diff --git a/configure.in b/configure.in -index f277cac..433c4a2 100644 +index beb8aac..343292e 100644 --- a/configure.in +++ b/configure.in -@@ -2842,29 +2842,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ +@@ -2861,28 +2861,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ --with-pic ], [$SKIP_CONFIG_DVDCSS]) @@ -54,7 +54,6 @@ index f277cac..433c4a2 100644 - --disable-strip \ - --disable-opts \ - --cc="$CC" && -- $MAKE dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread @@ -62,10 +61,9 @@ index f277cac..433c4a2 100644 - XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ ./configure2 \ -- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ + --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ - --extra-ldflags="-L`pwd`/../libdvdread/obj" \ -- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ -+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \ +- --with-dvdread-config="`pwd`/../dvdread-config" \ --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ --host=$host_alias \ --build=$build_alias \ |