From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 10 Apr 2006 11:36:03 +0300 From: "Kirill A. Shutemov" To: ALT Devel discussion list Message-ID: <20060410083603.GA7351@pc152.sam-solutions.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="l76fUT7nc3MelDdI" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-OriginalArrivalTime: 10 Apr 2006 08:34:39.0803 (UTC) FILETIME=[9B9A80B0:01C65C79] Subject: [devel] MPlayer X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.7 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 08:34:56 -0000 Archived-At: List-Archive: List-Post: --l76fUT7nc3MelDdI Content-Type: multipart/mixed; boundary="Q68bSM7Ycu6FN28Q" Content-Disposition: inline --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =F0=CF=CB=CF=D7=D9=D2=D1=CC =CE=C1=CD=C5=C4=CE=C9 MPlayer. =F3=C4=C5=CC=C1= =CC =D3=CC=C5=C4=D5=C0=DD=C5=C5: - caca support added - aalib fixed and re-enabled - re-enabled samba support - svgalib support enabled =E4=C5=CC=C1=D4=D8 =CC=C9 NMU? Diff =D3=D0=C5=CB=C9 =C9 =D0=C1=D4=DE =D0=D2=C9=CC=C1=C7=C1=C0=D4=D3=D1. --=20 Kirill A. Shutemov Belarus, Minsk E-mail: k.shutemov (AT) sam-solutions.net JID: kas (AT) altlinux.org ICQ: 152302675 =C8=CF=D4=D1 =DE=A3 =D1 =C7=D9=C7=D9=CB=C1=C0... =C7=D5=CA =C4= =CC=D1 objdump'=C1 =CB=D4=CF-=D4=CF =D0=C9=D3=C1=CC, =D7=D2=CF=C4=C5 =C1 =C7=D5=CA - =DC=D4=CF =D7=CF=D7=D3=C5=CD =CE=C5 =C4=C9=DA=C1=D3= =D3=C5=CD=C2=CC=C5=D2 ;) bzzz_: =DC=D4=CF _=D4=D9_ =D4=C1=CB =C4=D5=CD=C1=C5=DB=D8 =3D) drF_ckoff: =C1=CE=C1=CC=CF=C7=C9=DE=CE=CF ;) --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="MPlayer.spec.diff" Content-Transfer-Encoding: quoted-printable --- MPlayer.spec.orig 2006-04-08 11:40:04 +0300 +++ MPlayer.spec 2006-04-10 11:32:10 +0300 @@ -3,7 +3,7 @@ =20 %define base_version 1.0 %define real_version %base_version -%define release alt23 +%define release alt24 %define pre_release pre7try2 =20 %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 =20 -%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 =20 @@ -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 =20 @@ -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 =20 BuildRequires: xorg-x11-devel xorg-x11-mesaGL =20 @@ -351,6 +353,10 @@ BuildRequires: aalib-devel %endif =20 +%if_enabled caca +BuildRequires: libcaca-devel +%endif + %if_enabled directfb BuildRequires: directfb-devel %endif @@ -504,6 +510,14 @@ %force_disable aa %endif =20 +%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 =20 %__subst 's/\(ldconfig\)/\#\1/g' libdha/Makefile =20 @@ -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 =20 %changelog +* Sat Apr 08 2006 Kirill A. Shutemov 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 1.0-alt23.pre7= try2 - Packaged skins separately. =20 --Q68bSM7Ycu6FN28Q Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="MPlayer-1.0pre7try2-aalib-fix.patch" --- 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 --Q68bSM7Ycu6FN28Q-- --l76fUT7nc3MelDdI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEOhjzbWYnhzC5v6oRAi6dAJsG58I62/WL1RVkm8DC7CCq3kTWDACcCWyl 4QwBiUvPtR6rys+TE7KNkzQ= =cd+A -----END PGP SIGNATURE----- --l76fUT7nc3MelDdI--