diff options
Diffstat (limited to 'xbmc-13.0-dvdread.patch')
| -rw-r--r-- | xbmc-13.0-dvdread.patch | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/xbmc-13.0-dvdread.patch b/xbmc-13.0-dvdread.patch index d600972..065e93d 100644 --- a/xbmc-13.0-dvdread.patch +++ b/xbmc-13.0-dvdread.patch @@ -1,11 +1,15 @@ -commit 56647b999a332d78d9cfc758e8333ecc5c32f735 -Author: Ken Dreyer <ktdreyer@ktdreyer.com> -Date: Mon May 6 17:07:40 2013 -0600 +From 8a7a8d18094791bd57237b014cbd88fb033aab4d Mon Sep 17 00:00:00 2001 +From: Ken Dreyer <ktdreyer@ktdreyer.com> +Date: Sun, 24 Nov 2013 21:13:37 -0700 +Subject: [PATCH 1/2] Fedora: use external dvdread - Fedora: use external dvdread - - Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> - (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) +Original patch by Alex Lancaster <alexlan[AT]fedoraproject org> +(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) +--- + bootstrap.mk | 5 ----- + configure.in | 22 +--------------------- + lib/libdvd/Makefile.in | 20 +++++++------------- + 3 files changed, 8 insertions(+), 39 deletions(-) diff --git a/bootstrap.mk b/bootstrap.mk index 8bc4795..1fc31a4 100644 @@ -31,16 +35,16 @@ index 8bc4795..1fc31a4 100644 autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache diff --git a/configure.in b/configure.in -index 50bdf83..6136ecd 100644 +index 294e300..7a52036 100644 --- a/configure.in +++ b/configure.in -@@ -2734,29 +2734,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ +@@ -2825,29 +2825,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [ --with-pic ], [$SKIP_CONFIG_DVDCSS]) -XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ - ./configure2 \ -- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \ +- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \ - --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ - --host=$host_alias \ - --build=$build_alias \ @@ -58,7 +62,7 @@ index 50bdf83..6136ecd 100644 - XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ ./configure2 \ -- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \ +- --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" \ @@ -132,3 +136,6 @@ index 69d2286..1f5eebb 100644 libdvdnav/obj/libdvdnav.a: libdvdnav; libdvdnav: compile $(MAKE) -C $@ +-- +1.8.3.1 + |