Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdd792e7dafbfeb397b3425b0cc53ddd24dcf2e5
commit fdd792e7dafbfeb397b3425b0cc53ddd24dcf2e5
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Dec 5 09:44:20 2007 +0100
mplayer-1.0rc2-2-i686
moved amrnb and amrwb to a separate package (so that other pkgs can use it, too)
removed two no longer used patches
diff --git a/source/xapps/mplayer/CVE-2007-2948.diff
b/source/xapps/mplayer/CVE-2007-2948.diff
deleted file mode 100644
index 2ecdcc5..0000000
--- a/source/xapps/mplayer/CVE-2007-2948.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/stream/stream_cddb.c 2007/05/10 11:43:39 23287
-+++ trunk/stream/stream_cddb.c 2007/06/05 11:13:32 23470
-@@ -377,7 +377,7 @@
-
- switch(status) {
- case 210:
-- ret = sscanf( http_hdr->body, "%d %s %08lx", &status,
category, &disc_id);
-+ ret = sscanf( http_hdr->body, "%d %99s %08lx", &status,
category, &disc_id);
- if( ret!=3 ) {
- mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- return -1;
-@@ -438,7 +438,7 @@
- ptr++;
- // We have a list of exact/inexact matches, so which one do we use?
- // So let's take the first one.
-- ret = sscanf(ptr, "%s %08lx %s", cddb_data->category,
&(cddb_data->disc_id), album_title);
-+ ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category,
&(cddb_data->disc_id), album_title);
- if( ret!=3 ) {
- mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- return -1;
-@@ -475,7 +475,7 @@
- switch(status) {
- case 200:
- // Found exact match
-- ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status,
cddb_data->category, &(cddb_data->disc_id), album_title);
-+ ret = sscanf(http_hdr->body, "%d %99s %08lx %99s",
&status, cddb_data->category, &(cddb_data->disc_id), album_title);
- if( ret!=4 ) {
- mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- return -1;
diff --git a/source/xapps/mplayer/DMO_VideoDecoder.diff
b/source/xapps/mplayer/DMO_VideoDecoder.diff
deleted file mode 100644
index 7543412..0000000
--- a/source/xapps/mplayer/DMO_VideoDecoder.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204&view=patch
---- trunk/loader/dmo/DMO_VideoDecoder.c 2007/01/26 09:21:22 22019
-+++ trunk/loader/dmo/DMO_VideoDecoder.c 2007/02/11 17:55:49 22204
-@@ -119,6 +119,7 @@
-
- this->iv.m_bh = malloc(bihs);
- memcpy(this->iv.m_bh, format, bihs);
-+ this->iv.m_bh->biSize = bihs;
-
- this->iv.m_State = STOP;
- //this->iv.m_pFrame = 0;
diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 337d54e..d99ad7a 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -5,13 +5,13 @@ pkgname=mplayer
_F_archive_name=MPlayer
pkgver=1.0rc2
pkgextraver=
-pkgrel=1
+pkgrel=2
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/";
depends=('mesa' 'fontconfig' 'libstdc++' 'libdv' 'termcap' 'libjpeg' 'libmad' \
'libungif' 'xvidcore' 'libpng' 'sdl' 'lame' 'libxv' 'lzo' 'libsm' \
'libxinerama' 'libtheora' 'cdparanoia' 'libxxf86dga' 'live' 'gtk+2' \
- 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix')
+ 'x264>=20070421' 'dejavu-ttf' 'openal' 'vidix' 'amrnb' 'amrwb')
[ "$CARCH" == "i686" ] && depends=([EMAIL PROTECTED] 'codecs')
groups=('xapps')
backup=('etc/mplayer/mplayer.conf')
@@ -24,17 +24,14 @@
source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver$pkgext
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
-
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-
http://www.3gpp.org/ftp/Specs/archive/26_series/{26.104/26104-510.zip,26.204/26204-510.zip})
+
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2)
sha1sums=('e9b496f3527c552004ec6d01d6b43f196b43ce2d' \
'f7492d46afc72678435b70fa4326dbbf32795ba9' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
- '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
- 'b22dbe895991c23fad446c3c4ff7b6db12673778' \
- '9ca910295c2888fba95a98da83762a22aaf34651')
+ '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d')
# To add v4l support.
# mknod -m 660 /dev/video0 c 81 0
@@ -44,14 +41,6 @@ build()
unset CFLAGS
Fcd MPlayer-$pkgver$pkgextraver
Fpatchall
- mkdir -p libavcodec/amr_float
- cd libavcodec/amr_float
- unzip -o -q $Fsrcdir/26104-510_ANSI_C_source_code.zip
- cd -
- mkdir -p libavcodec/amrwb_float
- cd libavcodec/amrwb_float
- unzip -o -q $Fsrcdir/26204-510_ANSI-C_source_code.zip
- cd -
Fmake --confdir=/etc/mplayer --enable-gui --language=all \
--enable-runtime-cpudetection --enable-liblzo \
--enable-largefiles --enable-mga --enable-xmga \
@@ -75,8 +64,8 @@ build()
# Install mplayer.conf
Ffilerel etc/example.conf /etc/mplayer/mplayer.conf
- ## symlink to solve this "New_Face failed. Maybe the font path is
wrong." and this
- ## annoying popup about font missing :S
+
+ # Install default ttf font
Fln /usr/lib/X11/fonts/TTF/DejaVuSans.ttf /usr/share/mplayer/subfont.ttf
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
