From 4b30f13d69768cb66f0ee64bf29f7c04ac595d54 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Sun, 20 Nov 2011 04:30:29 +0100
Subject: [PATCH] - don't build the bundled libdvdnav (unused because DVD input
 is disabled) - plugin ABI is now 1.30 - cat config.log and exit 1 to debug
 smbc_init detection issue

---
 xine-lib.spec | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/xine-lib.spec b/xine-lib.spec
index 3bdf3b8..944fbea 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -2,7 +2,7 @@
 # - libstk:  http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
 # - drop the opengl video out plugin?
 
-%define         plugin_abi  1.29
+%define         plugin_abi  1.30
 %define         codecdir    %{_libdir}/codecs
 
 %ifarch %{ix86}
@@ -140,22 +140,12 @@ This package contains extra plugins for %{name}:
 %patch0 -p1 -b .no_autopoint
 # extra work for to omit old libtool-related crud
 rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
-./autogen.sh noconfig
-rm -rf autom4te.cache *~
-touch -r configure.ac aclocal.m4
-touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch1 -p1 -b .optflags
-touch -r m4/optimizations.m4.stamp m4/optimizations.m4
 %patch8 -p1 -b .avsync_hack
 %patch9 -p1 -b .multilib
 
-# autotools patch + touch'ing above seems to miss something, aclocal
-# runs on make anyway, let's use the ./autogen.sh hammer for now.
 ./autogen.sh noconfig
 
-#Avoid standard rpaths on lib64 archs: (autotools patch handles this too)
-#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
-
 
 %build
 export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" "
@@ -187,6 +177,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
 %endif # freetype
     --with-caca \
     --with-external-ffmpeg \
+    --with-external-dvdnav \
     --with-xv-path=%{_libdir} \
     --with-libflac \
     --with-external-libmpcdec \
@@ -198,6 +189,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
     --with-real-codecs-path=%{codecdir} \
     --with-w32-path=%{codecdir}
 
+cat config.log
+exit 1
+
 make %{?_smp_mflags}
 
 
@@ -390,6 +384,8 @@ rm -rf $RPM_BUILD_ROOT
 - drop autotools patch, run autogen.sh in %%prep instead
 - drop unused deepbind patch
 - drop xvmclib_header patch, fixed upstream
+- don't build the bundled libdvdnav (unused because DVD input is disabled)
+- plugin ABI is now 1.30
 
 * Fri Jul 15 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.19-7
 - rebuild for new DirectFB (1.5.0)