[devel] MPlayer

["Kirill A. Shutemov" <kas@altlinux.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 536 bytes --]

Поковырял намедни MPlayer. Сделал следующее:
- caca support added
- aalib fixed and re-enabled
- re-enabled samba support
- svgalib support enabled

Делать ли NMU?

Diff спеки и патч прилагаются.

-- 
Kirill A. Shutemov				Belarus, Minsk
E-mail:	k.shutemov (AT) sam-solutions.net
JID: kas (AT) altlinux.org
ICQ: 152302675

<drF_ckoff> хотя чё я гыгыкаю... гуй для objdump'а кто-то писал, вроде
<bzzz_> а гуй - это вовсем не дизассемблер ;)
<drF_ckoff> bzzz_: это _ты_ так думаешь =)
<bzzz_> drF_ckoff: аналогично ;)

[-- Attachment #1.2: MPlayer.spec.diff --]
[-- Type: text/plain, Size: 2656 bytes --]

--- MPlayer.spec.orig	2006-04-08 11:40:04 +0300
+++ MPlayer.spec	2006-04-10 11:32:10 +0300
@@ -3,7 +3,7 @@
 
 %define base_version	1.0
 %define real_version	%base_version
-%define release		alt23
+%define release		alt24
 %define pre_release	pre7try2
 
 %define fversion	%real_version
@@ -140,7 +140,7 @@
 %def_enable  lirc
 %def_enable  tv
 %def_enable  network
-%def_disable smb
+%def_enable  smb
 %def_enable  dvdread
 %def_enable  mpdvdkit
 %def_enable  cdparanoia
@@ -153,7 +153,8 @@
 %def_disable debug
 %def_enable  dynamic_plugins
 
-%def_disable aalib
+%def_enable  aalib
+%def_enable  caca
 %def_enable  directfb
 %def_enable  dvb
 %def_disable dxr3
@@ -161,7 +162,7 @@
 %def_disable ggi
 %def_enable  gl
 %def_enable  sdl
-%def_disable svga
+%def_enable  svga
 %def_enable  tga
 %def_enable  vidix
 
@@ -188,13 +189,13 @@
 %def_enable  mad
 %def_enable  xmms
 %def_enable  jack
-%def_enable cpu_detection
-%def_enable mmx
-%def_enable mmx2
-%def_enable 3dnow
-%def_enable 3dnowex
-%def_enable sse
-%def_enable sse2
+%def_enable  cpu_detection
+%def_enable  mmx
+%def_enable  mmx2
+%def_enable  3dnow
+%def_enable  3dnowex
+%def_enable  sse
+%def_enable  sse2
 #%%def_enable  flac
 #%%def_disable external_flac
 
@@ -300,6 +301,7 @@
 Patch23:  ad_pcm_fix_20050826.diff
 Patch24:  MPlayer-1.0pre7try2-xmmslibs_fix.patch
 Patch25:  MPlayer-1.0pre7try2-libdir_fix.patch
+Patch26:  MPlayer-1.0pre7try2-aalib-fix.patch
 
 BuildRequires: xorg-x11-devel xorg-x11-mesaGL
 
@@ -351,6 +353,10 @@
 BuildRequires: aalib-devel
 %endif
 
+%if_enabled caca
+BuildRequires: libcaca-devel
+%endif
+
 %if_enabled directfb
 BuildRequires: directfb-devel
 %endif
@@ -504,6 +510,14 @@
 %force_disable aa
 %endif
 
+%if_enabled caca
+%force_enable caca
+%endif
+
+%if_disabled caca
+%force_disable caca
+%endif
+
 %if_enabled fame
 %force_enable libfame
 %endif
@@ -815,6 +829,7 @@
 # %patch23 -p0
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 
 %__subst 's/\(ldconfig\)/\#\1/g' libdha/Makefile
 
@@ -924,6 +939,7 @@
 		--disable-dynamic-plugins \
 %endif
 		%{subst_enable aa} \
+		%{subst_enable caca} \
 		%{subst_enable directfb} \
 		--disable-dvb \
 		%{subst_enable dvbhead} \
@@ -1209,6 +1225,12 @@
 %_libdir/vidix/unichrome_vid.so
 
 %changelog
+* Sat Apr 08 2006 Kirill A. Shutemov <kas@altlinux.ru> 1.0-alt24.pre7try2
+- caca support added
+- aalib fixed and re-enabled
+- re-enabled samba support
+- svgalib support enabled
+
 * Thu Jan 26 2006 ALT QA Team Robot <qa-robot@altlinux.org> 1.0-alt23.pre7try2
 - Packaged skins separately.
 

[-- Attachment #1.3: MPlayer-1.0pre7try2-aalib-fix.patch --]
[-- Type: text/plain, Size: 417 bytes --]

--- MPlayer-1.0pre7try2.orig/configure	2006-04-07 18:02:32 +0300
+++ MPlayer-1.0pre7try2/configure	2006-04-07 18:21:42 +0300
@@ -3801,6 +3801,13 @@
   if cygwin ; then
     _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
   fi
+
+  if cc_check -laa ; then
+    _ld_aa="-laa"
+  elif cc_check $_ld_x11 -laa ; then
+    _ld_aa="$_ld_x11 -laa"
+  fi
+
   _vosrc="$_vosrc vo_aa.c"
   _vomodules="aa $_vomodules"
 else

[-- Attachment #2: Type: application/pgp-signature, Size: 191 bytes --]