Author: cactus                       Date: Mon Mar 28 10:29:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- clean up configuration, enable x264

---- Files affected:
packages/mplayer2:
   mplayer2.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/mplayer2/mplayer2.spec
diff -u packages/mplayer2/mplayer2.spec:1.4 packages/mplayer2/mplayer2.spec:1.5
--- packages/mplayer2/mplayer2.spec:1.4 Mon Mar 28 01:19:59 2011
+++ packages/mplayer2/mplayer2.spec     Mon Mar 28 12:29:32 2011
@@ -46,7 +46,6 @@
 %bcond_without mencoder        # disable mencoder (a/v encoder) compilation
 %bcond_without sdl             # disable SDL
 %bcond_without doc             # don't build docs (slow)
-%bcond_with    shared          # experimental libmplayer.so support
 %bcond_without amr             # enable Adaptive Multi Rate (AMR) speech codec 
support
 %bcond_without gnomess         # disable controling gnome screensaver
 %bcond_without ssse3           # sse3 optimizations (needs binutils >= 2.16.92)
@@ -230,10 +229,6 @@
 
 # set ffmpeg options:
 echo " --arch=%{_target_base_arch}" >>ffmpeg_options
-#echo "        --prefix=%{_prefix}" >>ffmpeg_options
-#echo "        --libdir=%{_libdir}" >>ffmpeg_options
-#echo "        --shlibdir=%{_libdir}" >>ffmpeg_options
-#echo "        --mandir=%{_mandir}" >>ffmpeg_options
 echo " --cc="%{__cc}"" >>ffmpeg_options
 echo " --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}"" 
>>ffmpeg_options
 echo " --extra-ldflags="%{rpmcflags} %{rpmldflags}"" >>ffmpeg_options
@@ -255,8 +250,8 @@
 echo " --enable-libtheora" >>ffmpeg_options
 echo " --enable-libvorbis" >>ffmpeg_options
 echo " %{?with_vpx:--enable-libvpx}" >>ffmpeg_options
-# x264 >= 0.99
-#echo "        --enable-libx264" >>ffmpeg_options
+# x264 API >= 0.99
+echo " --enable-libx264" >>ffmpeg_options
 echo " --enable-libxvid" >>ffmpeg_options
 echo " --enable-libopencore-amrnb" >>ffmpeg_options
 echo " --enable-libopencore-amrwb" >>ffmpeg_options
@@ -422,6 +417,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/03/28 10:29:32  cactus
+- clean up configuration, enable x264
+
 Revision 1.4  2011/03/27 23:19:59  cactus
 - build options for ffmpeg, x264 does not work
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer2/mplayer2.spec?r1=1.4&r2=1.5&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to