dvdread.patch

   1 origin:
   2 http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/xbmc-13.0-dvdread.patch?revision=1.1&root=free&view=markup
   3
   4 From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001
   5 From: Ken Dreyer <ktdreyer@ktdreyer.com>
   6 Date: Mon, 6 May 2013 17:07:40 -0600
   7 Subject: [PATCH 1/3] Fedora: use external dvdread
   8
   9 Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
  10 (cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
  11 ---
  12  bootstrap.mk           |  5 -----
  13  configure.in           | 19 -------------------
  14  lib/libdvd/Makefile.in | 20 +++++++-------------
  15  3 files changed, 7 insertions(+), 37 deletions(-)
  16
  17 diff --git a/bootstrap.mk b/bootstrap.mk
  18 index 8bc4795..1fc31a4 100644
  19 --- a/bootstrap.mk
  20 +++ b/bootstrap.mk
  21 @@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
  22  BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
  23  DVD_CSS=lib/libdvd/libdvdcss/configure
  24  endif
  25 -BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
  26  BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
  27
  28  ifneq ($(wildcard pvr-addons/Makefile.am),)
  29 @@ -18,10 +17,6 @@ endif
  30  BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
  31  all: $(BOOTSTRAP_TARGETS)
  32
  33 -#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
  34 -lib/libdvd/libdvdread/configure: $(DVD_CSS)
  35 -lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
  36 -
  37  %: %.ac
  38         autoreconf -vif $(@D)
  39         -@rm -rf $(@D)/autom4te.cache
  40 diff --git a/configure.ac b/configure.ac
  41 index beb8aac..343292e 100644
  42 --- a/configure.ac
  43 +++ b/configure.ac
  44 @@ -2860,27 +2860,9 @@
  45      --with-pic
  46  ], [$SKIP_CONFIG_DVDCSS])
  47
  48 -XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
  49 -  ./configure2 \
  50 -    --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src $DROID_DVDLIB_SEEK64" \
  51 -    --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
  52 -    --host=$host_alias \
  53 -    --build=$build_alias \
  54 -    --target=$target_alias \
  55 -    --enable-static \
  56 -    --disable-shared \
  57 -    --disable-strip \
  58 -    --disable-opts \
  59 -    --cc="$CC" &&
  60 -  mkdir -p `pwd`/../includes/dvdread
  61 -  cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
  62 -  cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
  63 -], [0])
  64 -
  65  XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
  66    ./configure2 \
  67      --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \
  68 -    --extra-ldflags="-L`pwd`/../libdvdread/obj" \
  69      --with-dvdread-config="`pwd`/../dvdread-config" \
  70      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
  71      --host=$host_alias \
  72 diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
  73 index 69d2286..1f5eebb 100644
  74 --- a/lib/libdvd/Makefile.in
  75 +++ b/lib/libdvd/Makefile.in
  76 @@ -5,8 +5,7 @@ CXX=@CXX@
  77
  78  SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
  79  SOS= libdvdnav-$(ARCH).so
  80 -DIRS=  libdvdread \
  81 -       libdvdnav
  82 +DIRS=  libdvdnav
  83
  84  WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
  85  WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
  86 @@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
  87  ifeq ($(findstring osx,$(ARCH)),osx)
  88  LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
  89  else
  90 -LDFLAGS += -shared -fPIC -rdynamic
  91 +LDFLAGS += -shared -fPIC -rdynamic -ldvdread
  92  endif
  93
  94  ifeq ($(ARCH), powerpc-osx)
  95 @@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
  96
  97  DISTCLEAN_FILES=includes/dvdread/*.h \
  98                 includes/dvdcss/*.h \
  99 -               libdvdnav/config.h \
 100 -               libdvdread/config.h
 101 +               libdvdnav/config.h
 102
 103  .PHONY: $(DIRS) compile
 104
 105 @@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so:  $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
 106         $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
 107                 $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
 108
 109 -$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
 110 +$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
 111         $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
 112 -               $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
 113 +               $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
 114
 115  else
 116
 117 @@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
 118                 libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
 119                 `cat $(WRAPPER:.o=.def)` $(WRAPPER)
 120
 121 -$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
 122 -       $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
 123 +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
 124 +       $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
 125                 -Wl,--unresolved-symbols=ignore-all \
 126                 `cat $(WRAPPER:.o=.def)` $(WRAPPER)
 127
 128 @@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
 129  libdvdcss: compile
 130         $(MAKE) -C $@
 131
 132 -libdvdread/obj/libdvdread.a: libdvdread;
 133 -libdvdread: compile
 134 -       $(MAKE) -C $@
 135 -
 136  libdvdnav/obj/libdvdnav.a: libdvdnav;
 137  libdvdnav: compile
 138         $(MAKE) -C $@
 139 --
 140 1.8.5.3
 141