From f067192c38e4af6208b1f35a76f0c952266869f8 Mon Sep 17 00:00:00 2001 From: rhatto Date: Wed, 3 Sep 2008 03:48:23 +0000 Subject: merging with changes made since 21th May git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@233 18ef50b8-d735-4ccd-97c1-689132df3dd9 --- media/video/mplayer/MPlayer-1.0rc1.diff | 31 +++++++ media/video/mplayer/MPlayer.mkbuild | 142 ++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) create mode 100644 media/video/mplayer/MPlayer-1.0rc1.diff create mode 100644 media/video/mplayer/MPlayer.mkbuild (limited to 'media/video/mplayer') diff --git a/media/video/mplayer/MPlayer-1.0rc1.diff b/media/video/mplayer/MPlayer-1.0rc1.diff new file mode 100644 index 0000000..c9f53a8 --- /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.mkbuild b/media/video/mplayer/MPlayer.mkbuild new file mode 100644 index 0000000..363a341 --- /dev/null +++ b/media/video/mplayer/MPlayer.mkbuild @@ -0,0 +1,142 @@ +# +# This mkbuild is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or any later version. +# +# This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place - Suite 330, Boston, MA 02111-1307, USA +# + +#-------------------- +# Personal variables +#-------------------- +# Author name +[[SLACKBUILD AUTHOR]]="Silvio Rhatto" + +# Initials author name +[[SLACKBUILD AUTHOR INITIALS]]="rha" + +#------------------------ +# Construction Variables +#------------------------ +# +# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... ) +[[DOWNLOAD FOLDER URL]]="http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2" + +# +# Documentation files. Null ("") to auto-set commom doc-files: +[[DOCUMENTATION FILES]]="AUTHORS ChangeLog Copyright DOCS LICENSE README TOOLS" + +# Other configure arguments +# +# - Add --enable-runtime-cpudetection for package creation! +# - Removing ivtv as for slack 12.1 it`s not compiling. +[[OTHER CONFIGURE ARGS]]="--disable-ivtv --confdir=/etc --language=pt_BR --enable-largefiles --enable-gui --enable-real" + +# SlackBuild model +[[SLACKBUILD MODEL]]="generic.mkSlackBuild" + +# SlackBuild PATH in Slack.Sarava tree +[[SLACKBUILD PATH]]="media/video/mplayer" + +# +# Dependency list input +[[SLACK REQUIRED]]="speex: jack: libx264: faac: faad2" + +#--------------------- +# SlackBuild Sections +#--------------------- +# Default sections: +# head, set_variables, slkflags, start_structure, untar_source, +# make_package, install_package, build_package +# Warning: don't remove '#>>' and "#<<" tags. +#>> Start SlackBuild Sections: + on: head + on: slackbuildrc + on: set_variables + on: slkflags + on: error_codes + on: start_structure +off: create_build_user_and_group + on: download_source +off: md5sum_download_and_check_0 +off: md5sum_download_and_check_1 +off: gpg_signature_check + on: untar_source + on: patch_source + on: configure + on: make_package + on: install_package + on: strip_binaries +off: compress_manpages +off: compress_info_files +off: copy_init_scripts + on: install_documentation + on: slackdesc +off: move_config_files +off: postinstall_script + on: build_package + on: clean_builds +#<< End SlackBuild Sections + +#------------------ +# Sections changes +#------------------ +#>slackdesc +MPlayer: MPlayer (A Movie Player) +MPlayer: +MPlayer: MPlayer is a movie and animation player that supports a wide range +MPlayer: of codecs and file formats, including MPEG 1/2/4, DivX 3/4/5, Windows +MPlayer: Media 7/8/9, RealAudio/Video up to 9, Quicktime 5/6, and Vivo 1/2. +MPlayer: It has many MMX/SSE(2)/3Dnow(Ex) optimized native audio and video +MPlayer: codecs, but allows using XAnim's and RealPlayer's binary codec plugins, +MPlayer: and Win32 codec DLLs. It has basic VCD/DVD playback functionality, +MPlayer: including DVD subtitles, but supports many text-based subtitle formats +MPlayer: too. For video output, nearly every existing interface is supported. +MPlayer: +#download_source +# Dowload source if necessary +SRC="[[SOURCE NAME CONSTRUCTION STRING]]" +URL="[[DOWNLOAD FOLDER URL]]/$SRC" + +if [ ! -s "$SRC_DIR/$SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$SRC_DIR/$SRC" 2> /dev/null; then + wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET +fi + +# Download skin +SKIN="Blue" +SKIN_VERSION="1.7" +SKIN_EXT="bz2" +SKIN_SRC=${PACKAGE_SKIN:=$SKIN-$SKIN_VERSION.tar.$SKIN_EXT} +SKIN_URL="http://www.mplayerhq.hu/MPlayer/skins/$SKIN_SRC" + +if [ ! -s "$SRC_DIR/$SKIN_SRC" ] || ! [[DECOMPRESSOR]] [[DECOMPRESSOR TEST FLAG]] "$SRC_DIR/$SKIN_SRC" 2> /dev/null; then + wget "$SKIN_URL" -O "$SRC_DIR/$SKIN_SRC" || exit $ERROR_WGET +fi +#install_package +# Install +make install DESTDIR="$PKG" || exit $ERROR_INSTALL + +# Skin installation +SKIN_DIR=${SKIN_DIR:=$PKG/usr/share/mplayer/skins} +mkdir -p $SKIN_DIR +tar jxvf $SRC_DIR/$SKIN_SRC -C $SKIN_DIR +mv $SKIN_DIR/$SKIN $SKIN_DIR/default +# + LIBDIR="$PREFIX/lib" ++ ++if [ "$ARCH" == "i586" ] || [ "$ARCH" == "i686" ]; then ++ CONF_OPTIONS="$CONF_OPTIONS --enable-qtx" ++fi +#p< -- cgit v1.2.3