[svn] r5278 - trunk/rpms/xine-lib-moles
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Apr 16 18:33:55 CEST 2007
Author: thias
Date: 2007-04-16 18:33:54 +0200 (Mon, 16 Apr 2007)
New Revision: 5278
Added:
trunk/rpms/xine-lib-moles/xine-lib-1.1.5-pthread-check.patch
Modified:
trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib-extras.txt
trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib.txt
trunk/rpms/xine-lib-moles/xine-lib-moles.spec
Log:
Update xine-lib-moles to 1.1.5.
Modified: trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib-extras.txt
===================================================================
--- trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib-extras.txt 2007-04-16 14:57:50 UTC (rev 5277)
+++ trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib-extras.txt 2007-04-16 16:33:54 UTC (rev 5278)
@@ -1,10 +1,12 @@
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_arts.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_esd.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_jack.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_gdk_pixbuf.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_image.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_gnome_vfs.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_smb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_aa.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_directfb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_sdl.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_arts.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_esd.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_jack.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_pulseaudio.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_gdk_pixbuf.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_image.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_gnome_vfs.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_smb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_aa.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_caca.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_directfb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_sdl.so
Modified: trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib.txt
===================================================================
--- trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib.txt 2007-04-16 14:57:50 UTC (rev 5277)
+++ trunk/rpms/xine-lib-moles/rpm_-ql_xine-lib.txt 2007-04-16 16:33:54 UTC (rev 5278)
@@ -1,98 +1,100 @@
/usr/lib/codecs
/usr/lib/libxine.so.1
-/usr/lib/libxine.so.1.16.0
+/usr/lib/libxine.so.1.17.0
/usr/lib/xine
/usr/lib/xine/plugins
-/usr/lib/xine/plugins/1.1.4
-/usr/lib/xine/plugins/1.1.4/post
-/usr/lib/xine/plugins/1.1.4/post/xineplug_post_audio_filters.so
-/usr/lib/xine/plugins/1.1.4/post/xineplug_post_goom.so
-/usr/lib/xine/plugins/1.1.4/post/xineplug_post_mosaico.so
-/usr/lib/xine/plugins/1.1.4/post/xineplug_post_switch.so
-/usr/lib/xine/plugins/1.1.4/post/xineplug_post_visualizations.so
-/usr/lib/xine/plugins/1.1.4/vidix
-/usr/lib/xine/plugins/1.1.4/vidix/cyberblade_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/mach64_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/mga_crtc2_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/mga_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/nvidia_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/pm2_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/pm3_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/radeon_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/rage128_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/savage_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/sis_vid.so
-/usr/lib/xine/plugins/1.1.4/vidix/unichrome_vid.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_alsa.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_file.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_none.so
-/usr/lib/xine/plugins/1.1.4/xineplug_ao_out_oss.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_bitplane.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_lpcm.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_mpc.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_qt.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_real.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_real_audio.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_rgb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_speex.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_spudvb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_sputext.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_theora.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_vorbis.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_w32dll.so
-/usr/lib/xine/plugins/1.1.4/xineplug_decode_yuv.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_audio.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_avi.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_fli.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_flv.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_games.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_iff.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_image.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_matroska.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_mng.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_nsv.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_ogg.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_pva.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_qt.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_rawdv.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_real.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_slave.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_sputext.so
-/usr/lib/xine/plugins/1.1.4/xineplug_dmx_yuv_frames.so
-/usr/lib/xine/plugins/1.1.4/xineplug_flac.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_cdda.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_dvb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_file.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_http.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_net.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_pnm.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_pvr.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_rtp.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_rtsp.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_stdin_fifo.so
-/usr/lib/xine/plugins/1.1.4/xineplug_inp_v4l.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_fb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_none.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_opengl.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_syncfb.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_vidix.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_xshm.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_xv.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_xvmc.so
-/usr/lib/xine/plugins/1.1.4/xineplug_vo_out_xxmc.so
-/usr/lib/xine/plugins/1.1.4/xineplug_wavpack.so
-/usr/share/doc/xine-lib-1.1.4
-/usr/share/doc/xine-lib-1.1.4/AUTHORS
-/usr/share/doc/xine-lib-1.1.4/COPYING
-/usr/share/doc/xine-lib-1.1.4/CREDITS
-/usr/share/doc/xine-lib-1.1.4/ChangeLog
-/usr/share/doc/xine-lib-1.1.4/README
-/usr/share/doc/xine-lib-1.1.4/README.dvb
-/usr/share/doc/xine-lib-1.1.4/README.opengl
-/usr/share/doc/xine-lib-1.1.4/README.syncfb
-/usr/share/doc/xine-lib-1.1.4/TODO
-/usr/share/doc/xine-lib-1.1.4/faq.html
-/usr/share/doc/xine-lib-1.1.4/faq.txt
+/usr/lib/xine/plugins/1.1.5
+/usr/lib/xine/plugins/1.1.5/mime.types
+/usr/lib/xine/plugins/1.1.5/post
+/usr/lib/xine/plugins/1.1.5/post/xineplug_post_audio_filters.so
+/usr/lib/xine/plugins/1.1.5/post/xineplug_post_goom.so
+/usr/lib/xine/plugins/1.1.5/post/xineplug_post_mosaico.so
+/usr/lib/xine/plugins/1.1.5/post/xineplug_post_switch.so
+/usr/lib/xine/plugins/1.1.5/post/xineplug_post_visualizations.so
+/usr/lib/xine/plugins/1.1.5/vidix
+/usr/lib/xine/plugins/1.1.5/vidix/cyberblade_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/mach64_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/mga_crtc2_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/mga_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/nvidia_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/pm2_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/pm3_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/radeon_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/rage128_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/savage_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/sis_vid.so
+/usr/lib/xine/plugins/1.1.5/vidix/unichrome_vid.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_alsa.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_file.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_none.so
+/usr/lib/xine/plugins/1.1.5/xineplug_ao_out_oss.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_bitplane.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_gsm610.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_lpcm.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_mpc.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_qt.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_real.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_rgb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_speex.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_spudvb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_sputext.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_theora.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_vorbis.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_w32dll.so
+/usr/lib/xine/plugins/1.1.5/xineplug_decode_yuv.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_audio.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_avi.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_fli.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_flv.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_games.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_iff.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_image.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_matroska.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_mng.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_nsv.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_ogg.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_pva.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_qt.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_rawdv.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_real.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_slave.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_sputext.so
+/usr/lib/xine/plugins/1.1.5/xineplug_dmx_yuv_frames.so
+/usr/lib/xine/plugins/1.1.5/xineplug_flac.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_cdda.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_dvb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_file.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_http.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_net.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_pnm.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_pvr.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_rtp.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_rtsp.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_stdin_fifo.so
+/usr/lib/xine/plugins/1.1.5/xineplug_inp_v4l.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_fb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_none.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_opengl.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_syncfb.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_vidix.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_xshm.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_xv.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_xvmc.so
+/usr/lib/xine/plugins/1.1.5/xineplug_vo_out_xxmc.so
+/usr/lib/xine/plugins/1.1.5/xineplug_wavpack.so
+/usr/share/doc/xine-lib-1.1.5
+/usr/share/doc/xine-lib-1.1.5/AUTHORS
+/usr/share/doc/xine-lib-1.1.5/COPYING
+/usr/share/doc/xine-lib-1.1.5/COPYING.LIB
+/usr/share/doc/xine-lib-1.1.5/CREDITS
+/usr/share/doc/xine-lib-1.1.5/ChangeLog
+/usr/share/doc/xine-lib-1.1.5/README
+/usr/share/doc/xine-lib-1.1.5/README.dvb
+/usr/share/doc/xine-lib-1.1.5/README.opengl
+/usr/share/doc/xine-lib-1.1.5/README.syncfb
+/usr/share/doc/xine-lib-1.1.5/TODO
+/usr/share/doc/xine-lib-1.1.5/faq.html
+/usr/share/doc/xine-lib-1.1.5/faq.txt
/usr/share/locale/cs/LC_MESSAGES/libxine1.mo
/usr/share/locale/de/LC_MESSAGES/libxine1.mo
/usr/share/locale/es/LC_MESSAGES/libxine1.mo
Added: trunk/rpms/xine-lib-moles/xine-lib-1.1.5-pthread-check.patch
===================================================================
--- trunk/rpms/xine-lib-moles/xine-lib-1.1.5-pthread-check.patch (rev 0)
+++ trunk/rpms/xine-lib-moles/xine-lib-1.1.5-pthread-check.patch 2007-04-16 16:33:54 UTC (rev 5278)
@@ -0,0 +1,115 @@
+--- xine-lib-1.1.5/m4/pthreads.m4~ 2007-04-05 01:18:00.000000000 +0300
++++ xine-lib-1.1.5/m4/pthreads.m4 2007-04-05 01:18:00.000000000 +0300
+@@ -36,11 +36,15 @@
+ [ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS"
++
+ LIBS="$LIBS $PTHREAD_LIBS"
+- AC_COMPILE_IFELSE(
++ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+- [[#include <pthread.h>]],
+- [[pthread_create(NULL, NULL, NULL, NULL);]]
++ [[#include <pthread.h>
++ void *fakethread(void *arg) { return NULL; }
++ pthread_t fakevariable;
++ ]],
++ [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]]
+ )],
+ [cc_cv_pthreads=yes],
+ [cc_cv_pthreads=no])
+--- xine-lib-1.1.5/configure~ 2007-04-10 01:25:56.000000000 +0300
++++ xine-lib-1.1.5/configure 2007-04-10 01:25:56.000000000 +0300
+@@ -26074,14 +26074,15 @@
+ esac
+ fi
+
+- { echo "$as_me:$LINENO: checking if $CC supports Pthread" >&5
+-echo $ECHO_N "checking if $CC supports Pthread... $ECHO_C" >&6; }
++ echo "$as_me:$LINENO: checking if $CC supports Pthread" >&5
++echo $ECHO_N "checking if $CC supports Pthread... $ECHO_C" >&6
+ if test "${cc_cv_pthreads+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS"
++
+ LIBS="$LIBS $PTHREAD_LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -26090,47 +26091,55 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <pthread.h>
++ void *fakethread(void *arg) { return NULL; }
++ pthread_t fakevariable;
++
+ int
+ main ()
+ {
+-pthread_create(NULL, NULL, NULL, NULL);
++pthread_create(&fakevariable, NULL, &fakethread, NULL);
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
+ cc_cv_pthreads=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- cc_cv_pthreads=no
++cc_cv_pthreads=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $cc_cv_pthreads" >&5
+-echo "${ECHO_T}$cc_cv_pthreads" >&6; }
++echo "$as_me:$LINENO: result: $cc_cv_pthreads" >&5
++echo "${ECHO_T}$cc_cv_pthreads" >&6
+
+
+
Modified: trunk/rpms/xine-lib-moles/xine-lib-moles.spec
===================================================================
--- trunk/rpms/xine-lib-moles/xine-lib-moles.spec 2007-04-16 14:57:50 UTC (rev 5277)
+++ trunk/rpms/xine-lib-moles/xine-lib-moles.spec 2007-04-16 16:33:54 UTC (rev 5278)
@@ -5,15 +5,16 @@
Summary: Extra libraries for the Xine library
Name: xine-lib-moles
-Version: 1.1.4
+Version: 1.1.5
Release: 1
License: GPL
Group: System Environment/Libraries
URL: http://xinehq.de/
-Source0: http://dl.sf.net/xine/xine-lib-%{version}.tar.bz2
+Source0: http://downloads.sf.net/xine/xine-lib-%{version}.tar.bz2
# WARNING : Needs to be from the i386 package in order to contain vidix files
Source1: rpm_-ql_xine-lib.txt
Source2: rpm_-ql_xine-lib-extras.txt
+Patch0: xine-lib-1.1.5-pthread-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: xine-lib = %{version}
Requires: libdvdcss
@@ -41,14 +42,21 @@
%prep
%setup -n xine-lib-%{version}
+%patch0 -p1 -b .pthread-check
+# Avoid standard rpaths on lib64 archs
+%{__perl} -pi -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
%build
%configure \
+ --disable-rpath \
%{?_with_extffmpeg:--with-external-ffmpeg} \
%{!?_with_extdvdnav:--with-included-dvdnav} \
--with-external-a52dec \
--with-external-libmad
+# Remove /usr/lib64 RPATH on 64bit
+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make} %{?_smp_mflags}
@@ -57,9 +65,11 @@
%{__make} install DESTDIR="`pwd`/tmp"
# Only a small part of the libs are what we want, so clean up all the ones
# from packages already in Extras
-EXCLUDE="`grep -h "plugins.*\.so$" %{SOURCE1} %{SOURCE2} | cut -d "/" -f 4-`"
-for lib in ${EXCLUDE}; do
- %{__rm} -f tmp%{_libdir}/${lib}
+EXCLUDE="`grep -h 'xine/plugins/%{version}/' %{SOURCE1} %{SOURCE2} \
+ | cut -d '/' -f 4-`"
+# Remove only files, not directories
+for file in ${EXCLUDE}; do
+ test -f tmp%{_libdir}/${file} && %{__rm} -f tmp%{_libdir}/${file}
done
# ...then move all the remaining ones to be included.
%{__mkdir_p} %{buildroot}%{_libdir}
@@ -78,6 +88,12 @@
%changelog
+* Mon Apr 16 2007 Matthias Saou <http://freshrpms.net/> 1.1.5-1
+- Update to 1.1.5.
+- Include pthread patch (thanks to Ville Skyttä).
+- Better handle installation of wanted files (new "mime.types" in the way).
+- Remove /usr/lib64 RPATH on 64bit (taken from the xine-lib Fedora package).
+
* Thu Feb 1 2007 Matthias Saou <http://freshrpms.net/> 1.1.4-1
- Update to 1.1.4.
- Switch back to .tar.bz2 since it's there again.
@@ -334,11 +350,11 @@
(yeah, Fred, I'm doing that for you ;-)).
* Thu Nov 1 2001 Matthias Saou <http://freshrpms.net/>
-- Added the missing xineshot to %files.
+- Added the missing xineshot to %%files.
- Removed the menu navigation plugin : It's so buggy and not moving very
fast. If you want menu support, try Ogle, it's worth it!
- Added new man pages translations.
-- Cleaned-up the %doc section, lots were added recently.
+- Cleaned-up the %%doc section, lots were added recently.
- Modified the way the target cpu is forced, it should now be possible to
rebuild for anything else than i686.
More information about the svn-commits
mailing list