From 015219414ab569a21ede4718a6c81f9b82171c65 Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Mon, 24 Aug 2015 18:47:07 +0700 Subject: multimedia/kodi: Updated for version 15.1. Signed-off-by: Willy Sudiarto Raharjo --- multimedia/kodi/README | 2 +- multimedia/kodi/kodi.SlackBuild | 64 +++-------- multimedia/kodi/kodi.info | 14 +-- multimedia/kodi/patches/kodi-texturepacker.patch | 17 +++ multimedia/kodi/patches/sse2.patch | 12 -- multimedia/kodi/patches/xbmc-13.0-dvdread.patch | 138 ----------------------- multimedia/kodi/patches/xbmc-15.0-dvdread.patch | 138 +++++++++++++++++++++++ 7 files changed, 180 insertions(+), 205 deletions(-) create mode 100644 multimedia/kodi/patches/kodi-texturepacker.patch delete mode 100644 multimedia/kodi/patches/sse2.patch delete mode 100644 multimedia/kodi/patches/xbmc-13.0-dvdread.patch create mode 100644 multimedia/kodi/patches/xbmc-15.0-dvdread.patch (limited to 'multimedia') diff --git a/multimedia/kodi/README b/multimedia/kodi/README index b4f4da9a08..84985b207b 100644 --- a/multimedia/kodi/README +++ b/multimedia/kodi/README @@ -7,7 +7,7 @@ organize all your media to give you quick and immediate access. Optional dependencies: libcec, pulseaudio, libbluray, libnfs, libva, libdvdcss, lirc, cwiid, pybluez, id3lib, libvdpau, rtmpdump, afpfs-ng, -libmicrohttpd, avahi, lame, SDL2, cryptopp, and jsoncpp +libmicrohttpd, avahi, lame, SDL2 and libmodplug Optional: libcrystalhd and libshairport (not available at slackbuilds.org) diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 6bc6becc0a..886bc2a8ca 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -24,8 +24,9 @@ PRGNAM=kodi SRCNAM=xbmc -VERSION=${VERSION:-14.2} -FFMPEGVER=${FFMPEGVER:-2.4.6} +CODNAM=Isengard +VERSION=${VERSION:-15.1} +FFMPEGVER=${FFMPEGVER:-2.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,15 +62,14 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION-Helix -tar xvf $CWD/$SRCNAM-$VERSION-Helix.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION-Helix.tar.gz -cd $SRCNAM-$VERSION-Helix -tar xvf $CWD/$SRCNAM-pvr-addons-Helix_rc3.tar.gz 2>/dev/null || tar xvf $CWD/Helix_rc3.tar.gz +rm -rf $SRCNAM-$VERSION-$CODNAM +tar xvf $CWD/$SRCNAM-$VERSION-$CODNAM.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION-$CODNAM.tar.gz +cd $SRCNAM-$VERSION-$CODNAM # Don't have the Makefile download ffmpeg during install. -if [ -f "$CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz" ]; then - ln -s $CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz -elif [ -f "$CWD/${FFMPEGVER}-Helix.tar.gz" ]; then - ln -s $CWD/${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz +if [ -f "$CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz" ]; then + ln -s $CWD/FFmpeg-${FFMPEGVER}-${CODNAM}.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}.tar.gz +elif [ -f "$CWD/${FFMPEGVER}-${CODNAM}.tar.gz" ]; then + ln -s $CWD/${FFMPEGVER}-${CODNAM}.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-${CODNAM}.tar.gz else echo "FFMPEG wasn't found. Please download it and have it available" echo "in the source directory ${CWD}." @@ -82,13 +82,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix for sse2 cpu's. -if grep 'sse2' /proc/cpuinfo 2>&1 > /dev/null; then - patch -p1 < $CWD/patches/sse2.patch -fi - # No need to show Git: "Version" in a release build. -sed -i '/Git:/s|.*| return GetVersionShort();|' $SRCNAM/GUIInfoManager.cpp +sed -i '/Git:/s|.*| return GetVersionShort();|' $SRCNAM/GUIInfoManager.cpp # Patch for building against rtmpdump. Only needed if xbmc fails to build # w/rtmpdump. See the following link for a rather obtuse explanation. @@ -99,7 +94,11 @@ patch -p1 < $CWD/patches/xbmc-Gotham-rtmpdump-build.patch patch -p1 < $CWD/patches/xbmc-Helix-samba-4.0.patch # Use installed libdvdread. -patch -p1 < $CWD/patches/xbmc-13.0-dvdread.patch +patch -p1 < $CWD/patches/xbmc-15.0-dvdread.patch + +# Fix static linking for Texturepacker. Thanks to Gentoo. +# Issue: http://forum.kodi.tv/showthread.php?tid=220407 +patch -p0 < $CWD/patches/kodi-texturepacker.patch # Hack for using afpfs-ng. cat lib/afpfs-ng/fix_afpfs-ng_includes.patch | head -1336 | tail -1172 | patch -p1 @@ -126,32 +125,7 @@ if [ "${PULSE:-no}" == "yes" ]; then OPT_DEPS="$OPT_DEPS --enable-pulse" fi -# Build the pvr addons. -cd $SRCNAM-pvr-addons-Helix_rc3 - # Fix include statements. Only needed if jsoncpp is installed. - if [ -d /usr/include/jsoncpp ]; then - sed -i 's||' addons/*/*/FilmonAPI.cpp - fi - ./bootstrap - CFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \ - CXXFLAGS="$SLKCFLAGS $AFPFS_NGFLAGS -DGL_GLEXT_PROTOTYPES" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX}/xbmc/addons \ - --enable-release \ - --enable-addons-with-dependencies \ - --enable-static=no \ - --disable-silent-rules \ - --disable-dependency-tracking \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - - make -cd - - -# Only link to static library. -sed -i 's|-lsquish-native|-lsquish|' tools/TexturePacker/Makefile.in +export PATH="$PATH:$PWD/tools/depends/native/JsonSchemaBuilder/bin" # Need to fix an autoreconf error with older version of pkg-config. # http://forum.kodi.tv/showthread.php?tid=195791 @@ -209,9 +183,7 @@ if ! [ "${WII:-no}" = "no" ]; then fi gzip -9 $PKG/usr/man/man?/*.? -cp -a \ - tools/EventClients/README.txt $SRCNAM-pvr-addons-Helix_rc3/COPYING \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a tools/EventClients/README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Final clean up. diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index d3e1cdd76f..19bbefdeff 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -1,14 +1,12 @@ PRGNAM="kodi" -VERSION="14.2" +VERSION="15.1" HOMEPAGE="http://xbmc.org/" -DOWNLOAD="https://github.com/xbmc/xbmc/archive/14.2-Helix.tar.gz \ - https://github.com/opdenkamp/xbmc-pvr-addons/archive/Helix_rc3.tar.gz \ - https://github.com/xbmc/FFmpeg/archive/2.4.6-Helix.tar.gz" -MD5SUM="aa534c483cdd6cda71e5350c2094175b \ - 5fd7b09f11e0fb6c3a8874d4ed20a694 \ - 92f6208f6908ef1586bf34764ebeb073" +DOWNLOAD="http://mirrors.kodi.tv/releases/source/15.1-Isengard.tar.gz \ + https://github.com/xbmc/FFmpeg/archive/2.6.4-Isengard.tar.gz" +MD5SUM="d8acb0ef061b3e2fef88146cea1f4443 \ + 3dbd015fbfea2cbedf1fbd0779ab987e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk libass libmpeg2 libmodplug yajl tinyxml" +REQUIRES="jdk libass libmpeg2 yajl tinyxml" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" diff --git a/multimedia/kodi/patches/kodi-texturepacker.patch b/multimedia/kodi/patches/kodi-texturepacker.patch new file mode 100644 index 0000000000..fe3dcdcf7a --- /dev/null +++ b/multimedia/kodi/patches/kodi-texturepacker.patch @@ -0,0 +1,17 @@ +--- tools/depends/native/TexturePacker/Makefile.old 2015-03-17 22:29:18.880029509 +0100 ++++ tools/depends/native/TexturePacker/Makefile 2015-03-17 22:29:41.459671679 +0100 +@@ -9,14 +9,10 @@ + + ifeq ($(NATIVEPLATFORM),) + PLATFORM = native +- EXTRA_CONFIGURE = --enable-static + else + PLATFORM = $(NATIVEPLATFORM) + endif + +-ifeq ($(NATIVE_OS), linux) +- EXTRA_CONFIGURE = --enable-static +-endif + ifeq ($(NATIVE_OS), android) + EXTRA_CONFIGURE = --enable-static + endif diff --git a/multimedia/kodi/patches/sse2.patch b/multimedia/kodi/patches/sse2.patch deleted file mode 100644 index d9b730ed2f..0000000000 --- a/multimedia/kodi/patches/sse2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Git-xbmc.orig/lib/libsquish/config Git-xbmc/lib/libsquish/config ---- Git-xbmc.orig/lib/libsquish/config 2012-11-18 14:14:35.000000000 +0000 -+++ Git-xbmc/lib/libsquish/config 2012-12-07 02:54:22.864062271 +0000 -@@ -4,7 +4,7 @@ - USE_ALTIVEC ?= 0 - - # define to 1 to use SSE2 instructions --USE_SSE ?= 0 -+USE_SSE ?= 1 - - # default flags - CXXFLAGS ?= -O2 diff --git a/multimedia/kodi/patches/xbmc-13.0-dvdread.patch b/multimedia/kodi/patches/xbmc-13.0-dvdread.patch deleted file mode 100644 index d694a95cae..0000000000 --- a/multimedia/kodi/patches/xbmc-13.0-dvdread.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001 -From: Ken Dreyer -Date: Mon, 6 May 2013 17:07:40 -0600 -Subject: [PATCH 1/3] Fedora: use external dvdread - -Original patch by Alex Lancaster -(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) ---- - bootstrap.mk | 5 ----- - configure.in | 19 ------------------- - lib/libdvd/Makefile.in | 20 +++++++------------- - 3 files changed, 7 insertions(+), 37 deletions(-) - -diff --git a/bootstrap.mk b/bootstrap.mk -index 8bc4795..1fc31a4 100644 ---- a/bootstrap.mk -+++ b/bootstrap.mk -@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),) - BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac - DVD_CSS=lib/libdvd/libdvdcss/configure - endif --BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac - BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac - - ifneq ($(wildcard pvr-addons/Makefile.am),) -@@ -18,10 +17,6 @@ endif - BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS)) - all: $(BOOTSTRAP_TARGETS) - --#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav. --lib/libdvd/libdvdread/configure: $(DVD_CSS) --lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure -- - %: %.ac - autoreconf -vif $(@D) - -@rm -rf $(@D)/autom4te.cache -diff --git a/configure.in b/configure.in -index beb8aac..343292e 100644 ---- a/configure.in -+++ b/configure.in -@@ -2860,27 +2860,9 @@ - --with-pic - ], [$SKIP_CONFIG_DVDCSS]) - --XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ -- ./configure2 \ -- --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 \ -- --target=$target_alias \ -- --enable-static \ -- --disable-shared \ -- --disable-strip \ -- --disable-opts \ -- --cc="$CC" && -- mkdir -p `pwd`/../includes/dvdread -- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread -- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread --], [0]) -- - XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ - ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ -- --extra-ldflags="-L`pwd`/../libdvdread/obj" \ - --with-dvdread-config="`pwd`/../dvdread-config" \ - --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ - --host=$host_alias \ -diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in -index 69d2286..1f5eebb 100644 ---- a/lib/libdvd/Makefile.in -+++ b/lib/libdvd/Makefile.in -@@ -5,8 +5,7 @@ CXX=@CXX@ - - SYSDIR=@abs_top_srcdir@/system/players/dvdplayer - SOS= libdvdnav-$(ARCH).so --DIRS= libdvdread \ -- libdvdnav -+DIRS= libdvdnav - - WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o - WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias -@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al - ifeq ($(findstring osx,$(ARCH)),osx) - LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress - else --LDFLAGS += -shared -fPIC -rdynamic -+LDFLAGS += -shared -fPIC -rdynamic -ldvdread - endif - - ifeq ($(ARCH), powerpc-osx) -@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS)) - - DISTCLEAN_FILES=includes/dvdread/*.h \ - includes/dvdcss/*.h \ -- libdvdnav/config.h \ -- libdvdread/config.h -+ libdvdnav/config.h - - .PHONY: $(DIRS) compile - -@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a - $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ - $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O) - --$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a -+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a - $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ -- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) -+ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O) - - else - -@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a - libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - --$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a -- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \ -+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a -+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \ - -Wl,--unresolved-symbols=ignore-all \ - `cat $(WRAPPER:.o=.def)` $(WRAPPER) - -@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss; - libdvdcss: compile - $(MAKE) -C $@ - --libdvdread/obj/libdvdread.a: libdvdread; --libdvdread: compile -- $(MAKE) -C $@ -- - libdvdnav/obj/libdvdnav.a: libdvdnav; - libdvdnav: compile - $(MAKE) -C $@ --- -1.8.5.3 - diff --git a/multimedia/kodi/patches/xbmc-15.0-dvdread.patch b/multimedia/kodi/patches/xbmc-15.0-dvdread.patch new file mode 100644 index 0000000000..1387245c77 --- /dev/null +++ b/multimedia/kodi/patches/xbmc-15.0-dvdread.patch @@ -0,0 +1,138 @@ +From 7bc0877dc9715e891159392abf669f970722dece Mon Sep 17 00:00:00 2001 +From: Ken Dreyer +Date: Mon, 6 May 2013 17:07:40 -0600 +Subject: [PATCH 1/3] Fedora: use external dvdread + +Original patch by Alex Lancaster +(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03) +--- + bootstrap.mk | 5 ----- + configure.in | 19 ------------------- + lib/libdvd/Makefile.in | 20 +++++++------------- + 3 files changed, 7 insertions(+), 37 deletions(-) + +diff --git a/bootstrap.mk b/bootstrap.mk +index 8bc4795..1fc31a4 100644 +--- a/bootstrap.mk ++++ b/bootstrap.mk +@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),) + BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac + DVD_CSS=lib/libdvd/libdvdcss/configure + endif +-BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac + BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac + + ifneq ($(wildcard pvr-addons/Makefile.am),) +@@ -18,10 +17,6 @@ endif + BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS)) + all: $(BOOTSTRAP_TARGETS) + +-#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav. +-lib/libdvd/libdvdread/configure: $(DVD_CSS) +-lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure +- + %: %.ac + autoreconf -vif $(@D) + -@rm -rf $(@D)/autom4te.cache +diff --git a/configure.in b/configure.in +index beb8aac..343292e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2860,27 +2860,9 @@ + --with-pic + ], [$SKIP_CONFIG_DVDCSS]) + +-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [ +- ./configure2 \ +- --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 \ +- --target=$target_alias \ +- --enable-static \ +- --disable-shared \ +- --disable-strip \ +- --disable-opts \ +- --cc="$CC" && +- mkdir -p `pwd`/../includes/dvdread +- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread +- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread +-], [0]) +- + XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [ + ./configure2 \ + --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes $DROID_DVDLIB_SEEK64" \ +- --extra-ldflags="-L`pwd`/../libdvdread/obj" \ + --with-dvdread-config="`pwd`/../dvdread-config" \ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ +diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in +index 69d2286..1f5eebb 100644 +--- a/lib/libdvd/Makefile.in ++++ b/lib/libdvd/Makefile.in +@@ -5,8 +5,7 @@ CXX=@CXX@ + + SYSDIR=@abs_top_srcdir@/system/players/dvdplayer + SOS= libdvdnav-$(ARCH).so +-DIRS= libdvdread \ +- libdvdnav ++DIRS= libdvdnav + + WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o + WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias +@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al + ifeq ($(findstring osx,$(ARCH)),osx) + LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress + else +-LDFLAGS += -shared -fPIC -rdynamic ++LDFLAGS += -shared -fPIC -rdynamic -ldvdread + endif + + ifeq ($(ARCH), powerpc-osx) +@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS)) + + DISTCLEAN_FILES=includes/dvdread/*.h \ + includes/dvdcss/*.h \ +- libdvdnav/config.h \ +- libdvdread/config.h ++ libdvdnav/config.h + + .PHONY: $(DIRS) compile + +@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a + $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ + $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O) + +-$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a ++$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a + $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \ +- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) ++ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O) + + else + +@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a + libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \ + `cat $(WRAPPER:.o=.def)` $(WRAPPER) + +-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a +- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \ ++$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a ++ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \ + -Wl,--unresolved-symbols=ignore-all \ + `cat $(WRAPPER:.o=.def)` $(WRAPPER) + +@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss; + libdvdcss: compile + $(MAKE) -C $@ + +-libdvdread/obj/libdvdread.a: libdvdread; +-libdvdread: compile +- $(MAKE) -C $@ +- + libdvdnav/obj/libdvdnav.a: libdvdnav; + libdvdnav: compile + $(MAKE) -C $@ +-- +1.8.5.3 + -- cgit v1.2.3