mplayer: updated and patched

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1306 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 42 insertions, 11 deletions

diff --git a/media/video/mplayer/MPlayer-1.0rc1.diff b/media/video/mplayer/MPlayer-1.0rc1.diff
new file mode 100644
index 00000000..c9f53a80
--- /dev/null
+++ b/media/video/mplayer/MPlayer-1.0rc1.diff
@@ -0,0 +1,31 @@
+Index: stream/stream_cddb.c
+===================================================================
+--- stream/stream_cddb.c	(revision 20381)
++++ stream/stream_cddb.c	(working copy)
+@@ -435,7 +435,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;
+@@ -496,7 +496,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;
+@@ -533,7 +533,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/media/video/mplayer/MPlayer.SlackBuild b/media/video/mplayer/MPlayer.SlackBuild
index 0a87dfb8..b0c23cd4 100755
--- a/media/video/mplayer/MPlayer.SlackBuild
+++ b/media/video/mplayer/MPlayer.SlackBuild
@@ -43,7 +43,7 @@ fi
 PACKAGE="MPlayer"
 ARCH=${ARCH:=i486}
 VERSION=${VERSION:=1.0rc1}
-BUILD=${BUILD:=1rha}
+BUILD=${BUILD:=2rha}
 SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
@@ -57,7 +57,7 @@ PACKAGE_SKIN=${PACKAGE_SKIN:=$SKIN-$VERSION_SKIN.tar.$SKIN_EXT}
 # -------  error codes for createpkg  --------------
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
-ERROR_TAR=37;       ERROR_MKPKG=38;      ERROR_GPG=39
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40
 
 if [ "$ARCH" == "x86_64" ]; then
@@ -75,18 +75,14 @@ URL="http://www1.mplayerhq.hu/MPlayer/releases/$SRC"
 # URL do Skin do MPlayer
 URL_SKIN="http://www1.mplayerhq.hu/MPlayer/Skin/$SKIN-$VERSION_SKIN.tar.$SKIN_EXT"
 
-if [ "$PACKAGE_EXT" == "bz2" ]; then
-  tarflag="j"
-else
-  tarflag="z"
-fi
-
 SRC_DIR="$SRC_DIR/$PACKAGE"
 mkdir -p $SRC_DIR
 
 # Download do MPlayer
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
-  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+if [ "$RTOOL" == "wget" ]; then
+ if [ ! -f "$SRC_DIR/$SRC" ]; then
+   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+ fi
 fi
 
 # Download do Skin
@@ -99,9 +95,13 @@ rm -rf $TMP
 mkdir -p $TMP
 cd $TMP
 
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
 cd $PACKAGE-$VERSION
 
+if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
+  patch -p1 < $CWD/$PACKAGE-$VERSION.diff || exit $ERROR_PATCH
+fi
+
 if [ "$ARCH" == "i586" ] || [ "$ARCH" == "i686" ]; then
   EXTRA_ARGS="--enable-win32 --enable-qtx"
 fi