aboutsummaryrefslogtreecommitdiff
path: root/multimedia/MPlayer
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2010-05-11 20:30:41 +0200
committerHeinz Wiesinger <pprkut@slackbuilds.org>2010-05-11 20:30:41 +0200
commit884e8a19ff309fe8ccf1f7914909ba80a0e65202 (patch)
treef7e92a9f69a56d2877249e97fe69b9c7e834280b /multimedia/MPlayer
parent61c96b150ad2872fa57da35e5c232d48eecfb706 (diff)
multimedia/mplayer: Renamed from MPlayer
Diffstat (limited to 'multimedia/MPlayer')
-rw-r--r--multimedia/MPlayer/Blue-1.7.tar.bz2bin222567 -> 0 bytes
-rw-r--r--multimedia/MPlayer/MPlayer.SlackBuild180
-rw-r--r--multimedia/MPlayer/MPlayer.info8
-rw-r--r--multimedia/MPlayer/README19
-rw-r--r--multimedia/MPlayer/demux_audio_fix_20080129.diff12
-rw-r--r--multimedia/MPlayer/demux_mov_fix_20080129.diff46
-rw-r--r--multimedia/MPlayer/doinst.sh20
-rw-r--r--multimedia/MPlayer/ivtv_fix-2.6.24.x.diff33
-rw-r--r--multimedia/MPlayer/slack-desc19
-rw-r--r--multimedia/MPlayer/stream_cddb_fix_20080120.diff33
-rw-r--r--multimedia/MPlayer/url_fix_20080120.diff11
11 files changed, 0 insertions, 381 deletions
diff --git a/multimedia/MPlayer/Blue-1.7.tar.bz2 b/multimedia/MPlayer/Blue-1.7.tar.bz2
deleted file mode 100644
index 993bde3cb3..0000000000
--- a/multimedia/MPlayer/Blue-1.7.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/multimedia/MPlayer/MPlayer.SlackBuild b/multimedia/MPlayer/MPlayer.SlackBuild
deleted file mode 100644
index 735574e34f..0000000000
--- a/multimedia/MPlayer/MPlayer.SlackBuild
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for MPlayer
-
-# Copyright 2006-2008 Robby Workman, Northport, AL, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Thanks to Niki Kovaks for some suggestions on this
-# Thanks to Eric Hameleers for suggestions (and some code examples) :)
-
-PRGNAM=MPlayer
-VERSION=1.0rc2
-ARCH=${ARCH:-custom}
-BUILD=${BUILD:-3}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-PKGVERSION=$VERSION # This may change later in the script
-
-# If you installed the codecs package according to the instructions at
-# the MPlayer website, you'll probably want to change this variable
-# to /usr/local/lib/codecs. Otherwise, you'll want to leave it alone
-# (if you installed the codecs using our SlackBuild script for them)
-# unless you placed the codecs in a non-standard location.
-CODECSDIR=${CODECSDIR:-/usr/lib/codecs}
-
-# The default MPlayer theme is Blue
-# http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
-# Others may work fine here, but the script has not been tested with them
-# Even so, it's probably better to leave this alone and install additional
-# themes to $HOME/.mplayer/skins/
-THEME=Blue
-THEME_VERSION=1.7
-
-# The fonts listed below should exist on a stock Slackware 11.0 system.
-# If you want to change the default font after installation, that is probably
-# best done by making a link to your preferred font in $HOME/.mplayer/ by:
-# cd $HOME/.mplayer
-# ln -s /path/to/preferred/font subfont.ttf
-OSDFONTS="Arialuni.ttf arial.ttf DejaVuSans.ttf Vera.ttf"
-
-# This will build documentation for all languages - if you don't want some
-# of the, either change this or pass what you do want on the command line
-# when running the script: LANGUAGES=en ./MPlayer.SlackBuild
-LANGUAGES=${LANGUAGES:-"en nl fr de es"}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Apply some *almost* official patches. To clarify, the actual work done
-# by the patch is identical to the official patches released by upstream.
-# I just reworked them to apply from the toplevel source directory with -p1
-# --rworkman
-# Fix buffer overflow in url.c
-patch -p1 < $CWD/url_fix_20080120.diff
-# Fix buffer overflow in stream_cddb.c
-patch -p1 < $CWD/stream_cddb_fix_20080120.diff
-# Fix stack overflow in demux_audio.c
-patch -p1 < $CWD/demux_audio_fix_20080129.diff
-# Fix buffer overflow in demux_mov.c
-patch -p1 < $CWD/demux_mov_fix_20080129.diff
-
-# Patch to account for linux-2.6.24.x including ivtv, but MPlayer won't
-# build against it. See this link for more information and patch origin:
-# http://archives.free.net.ph/message/20080201.201454.1047775e.en.html
-patch -p1 < $CWD/ivtv_fix-2.6.24.x.diff
-
-# The MPlayer developers will not support and/or deal with bug reports
-# if you don't allow it to automatically determine compiler flags,
-# so modify this at your own risk
-CFLAGS= \
-./configure \
- --prefix=/usr \
- --mandir=/usr/man \
- --confdir=/etc/mplayer \
- --enable-color-console \
- --enable-gui \
- --enable-menu \
- --enable-runtime-cpudetection \
- --enable-largefiles \
- --codecsdir="$CODECSDIR" \
- --language="$LANGUAGES"
-
-make
-make install DESTDIR=$PKG
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/share/mplayer/skins
-if [ -r $CWD/$THEME-$THEME_VERSION.tar.bz2 ]; then
- cd $PKG/usr/share/mplayer/skins
- tar xf $CWD/$THEME-$THEME_VERSION.tar.bz2
- ln -s $THEME default
- cd -
-else
- echo A usable theme tarball does not appear to exist in $CWD
- echo \(or you didn't edit the script to reflect it, or something
- echo else is broken\)
- echo The script will continue to build a package, but some manual
- echo setup may be required after installation.
- echo
- echo Type \'exit\' to quit or any other key to continue the script.
- read _continue
- if [ "$_continue" = "exit" ]; then
- exit 1
- fi
-fi
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS Copyright LICENSE README DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/DOCS/man
-
-# Don't clobber an existing config file
-cat etc/example.conf > $PKG/etc/mplayer/mplayer.conf.new
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-# We'll link to one of the standard ttf fonts defined above.
-# Thanks to Eric Hameleers for this code snippet and permission to use it.
-cat << EOF >> $PKG/install/doinst.sh
-# Symlink a default TrueType font for OSD:
-if [ ! -f usr/share/mplayer/subfont.ttf ]; then
- for font in $OSDFONTS ; do
- if [ -f usr/share/fonts/TTF/\$font ]; then
- ( cd usr/share/mplayer
- ln -fs /usr/share/fonts/TTF/\$font subfont.ttf
- )
- break
- fi
- done
-fi
-EOF
-
-cd $PKG
-chown -R root:root . # Some files in /usr/share/mplayer are 103:99
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/MPlayer/MPlayer.info b/multimedia/MPlayer/MPlayer.info
deleted file mode 100644
index 7fc4ca9f92..0000000000
--- a/multimedia/MPlayer/MPlayer.info
+++ /dev/null
@@ -1,8 +0,0 @@
-PRGNAM="MPlayer"
-VERSION="1.0rc2"
-HOMEPAGE="http://www.mplayerhq.hu/"
-DOWNLOAD="http://www3.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2"
-MD5SUM="7e27e535c2d267637df34898f1b91707"
-MAINTAINER="Robby Workman"
-EMAIL="rw@rlworkman.net"
-APPROVED="BP{k}"
diff --git a/multimedia/MPlayer/README b/multimedia/MPlayer/README
deleted file mode 100644
index 695a5ba1af..0000000000
--- a/multimedia/MPlayer/README
+++ /dev/null
@@ -1,19 +0,0 @@
-MPlayer plays most MPEG, VOB, AVI, OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,
-FLI, RM, NuppelVideo, YUV4MPEG, FILM, RoQ, PVA files, supported by many
-native, XAnim, and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx,
-DivX 3/4/5 and even WMV movies, too (without the avifile library).
-
-The required codecs are available from the MPlayer site, and we have a
-SlackBuild script for them as well. If you have already installed the
-codecs on your own, then make sure the CODECSDIR variable in the script
-is defined correctly (or pass the correct value on the command line when
-running the SlackBuild script).
-
-This script is written to install the default "Blue" theme for MPlayer, and
-it will print an error (but allow you to continue) if you don't have the
-theme tarball in the build directory. You can obtain the Blue theme here:
- http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
-If you want to install some other theme, the script is written to support
-that, but other themes have not been tested with it. The best option for
-using additional themes/skins is to install them in $HOME/.mplayer by
-following the directions on the MPlayer homepage.
diff --git a/multimedia/MPlayer/demux_audio_fix_20080129.diff b/multimedia/MPlayer/demux_audio_fix_20080129.diff
deleted file mode 100644
index 3f4aa788b9..0000000000
--- a/multimedia/MPlayer/demux_audio_fix_20080129.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur MPlayer-1.0rc2.orig/libmpdemux/demux_audio.c MPlayer-1.0rc2/libmpdemux/demux_audio.c
---- MPlayer-1.0rc2.orig/libmpdemux/demux_audio.c 2008-02-01 09:57:58.058713289 -0600
-+++ MPlayer-1.0rc2/libmpdemux/demux_audio.c 2008-02-01 09:57:07.479830963 -0600
-@@ -229,6 +229,8 @@
- ptr += 4;
-
- comment = ptr;
-+ if (&comment[length] < comments || &comment[length] >= &comments[blk_len])
-+ return;
- c = comment[length];
- comment[length] = 0;
-
diff --git a/multimedia/MPlayer/demux_mov_fix_20080129.diff b/multimedia/MPlayer/demux_mov_fix_20080129.diff
deleted file mode 100644
index 9ef496b6bd..0000000000
--- a/multimedia/MPlayer/demux_mov_fix_20080129.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur MPlayer-1.0rc2.orig/libmpdemux/demux_mov.c MPlayer-1.0rc2/libmpdemux/demux_mov.c
---- MPlayer-1.0rc2.orig/libmpdemux/demux_mov.c 2007-10-07 14:49:33.000000000 -0500
-+++ MPlayer-1.0rc2/libmpdemux/demux_mov.c 2008-02-01 10:02:10.217082975 -0600
-@@ -173,11 +173,12 @@
- i=trak->chunkmap_size;
- while(i>0){
- --i;
-- for(j=trak->chunkmap[i].first;j<last;j++){
-+ j=FFMAX(trak->chunkmap[i].first, 0);
-+ for(;j<last;j++){
- trak->chunks[j].desc=trak->chunkmap[i].sdid;
- trak->chunks[j].size=trak->chunkmap[i].spc;
- }
-- last=trak->chunkmap[i].first;
-+ last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
- }
-
- #if 0
-@@ -235,6 +236,8 @@
- s=0;
- for(j=0;j<trak->durmap_size;j++){
- for(i=0;i<trak->durmap[j].num;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pts=pts;
- ++s;
- pts+=trak->durmap[j].dur;
-@@ -246,6 +249,8 @@
- for(j=0;j<trak->chunks_size;j++){
- off_t pos=trak->chunks[j].pos;
- for(i=0;i<trak->chunks[j].size;i++){
-+ if (s >= trak->samples_size)
-+ break;
- trak->samples[s].pos=pos;
- mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d off=0x%08X size=%d\n",s,
- trak->samples[s].pts,
-@@ -1568,8 +1573,7 @@
- if( udta_len>udta_size)
- udta_len=udta_size;
- {
-- char dump[udta_len-4];
-- stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
-+ stream_skip(demuxer->stream, udta_len-4-4);
- udta_size -= udta_len;
- }
- }
diff --git a/multimedia/MPlayer/doinst.sh b/multimedia/MPlayer/doinst.sh
deleted file mode 100644
index c428a05ede..0000000000
--- a/multimedia/MPlayer/doinst.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-
-config() {
- NEW="$1"
- OLD="$(dirname $NEW)/$(basename $NEW .new)"
- # If there's no config file by that name, mv it over:
- if [ ! -r $OLD ]; then
- mv $NEW $OLD
- elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
- # toss the redundant copy
- rm $NEW
- fi
- # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/mplayer/mplayer.conf.new
-
-if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database -q usr/share/applications
-fi
-
diff --git a/multimedia/MPlayer/ivtv_fix-2.6.24.x.diff b/multimedia/MPlayer/ivtv_fix-2.6.24.x.diff
deleted file mode 100644
index 60721f1957..0000000000
--- a/multimedia/MPlayer/ivtv_fix-2.6.24.x.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch to account for linux-2.6.24.x including ivtv, but MPlayer won't
-build against it. See this link for more information and the origin
-of the patch:
-http://archives.free.net.ph/message/20080201.201454.1047775e.en.html
-<rworkman@slackbuilds.org>
-
-diff -Nur MPlayer-1.0rc2.orig/configure MPlayer-1.0rc2/configure
---- MPlayer-1.0rc2.orig/configure 2007-10-07 14:49:33.000000000 -0500
-+++ MPlayer-1.0rc2/configure 2008-03-09 23:38:20.998568493 -0500
-@@ -4920,7 +4920,7 @@
- echores "$_dxr3"
-
-
--echocheck "IVTV TV-Out"
-+echocheck "IVTV TV-Out (pre linux-2.6.24)"
- if test "$_ivtv" = auto ; then
- cat > $TMPC << EOF
- #include <stdlib.h>
-@@ -4928,7 +4928,13 @@
- #include <linux/types.h>
- #include <linux/videodev2.h>
- #include <linux/ivtv.h>
--int main(void) { return 0; }
-+#include <sys/ioctl.h>
-+int main(void) {
-+struct ivtv_cfg_stop_decode sd;
-+struct ivtv_cfg_start_decode sd1;
-+ioctl (0, IVTV_IOC_START_DECODE, &sd1);
-+ioctl (0, IVTV_IOC_STOP_DECODE, &sd);
-+return 0; }
- EOF
- _ivtv=no
- cc_check && _ivtv=yes
diff --git a/multimedia/MPlayer/slack-desc b/multimedia/MPlayer/slack-desc
deleted file mode 100644
index 7dc15c1969..0000000000
--- a/multimedia/MPlayer/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler-----------------------------------------------------|
-MPlayer: MPlayer Media player for linux
-MPlayer:
-MPlayer: Media player for linux (runs on many other Unices, and non-x86
-MPlayer: CPUs, see the documentation) It plays most MPEG, VOB, AVI,
-MPlayer: OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo,
-MPlayer: YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim,
-MPlayer: and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx,
-MPlayer: DivX 3/4/5 and even WMV movies, too (without the avifile library).
-MPlayer:
-MPlayer: Homepage: http://www.mplayerhq.hu
-MPlayer:
diff --git a/multimedia/MPlayer/stream_cddb_fix_20080120.diff b/multimedia/MPlayer/stream_cddb_fix_20080120.diff
deleted file mode 100644
index 461d11c854..0000000000
--- a/multimedia/MPlayer/stream_cddb_fix_20080120.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur MPlayer-1.0rc2.orig/stream/stream_cddb.c MPlayer-1.0rc2/stream/stream_cddb.c
---- MPlayer-1.0rc2.orig/stream/stream_cddb.c 2007-10-07 14:49:26.000000000 -0500
-+++ MPlayer-1.0rc2/stream/stream_cddb.c 2008-02-01 10:06:49.913021939 -0600
-@@ -53,6 +53,7 @@
- #include "version.h"
- #include "stream.h"
- #include "network.h"
-+#include "libavutil/intreadwrite.h"
-
- #define DEFAULT_FREEDB_SERVER "freedb.freedb.org"
- #define DEFAULT_CACHE_DIR "/.cddb/"
-@@ -453,8 +454,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return 0;
-@@ -490,8 +492,9 @@
- } else {
- len = ptr2-ptr+1;
- }
-+ len = FFMIN(sizeof(album_title) - 1, len);
- strncpy(album_title, ptr, len);
-- album_title[len-2]='\0';
-+ album_title[len]='\0';
- }
- mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- return cddb_request_titles(cddb_data);
diff --git a/multimedia/MPlayer/url_fix_20080120.diff b/multimedia/MPlayer/url_fix_20080120.diff
deleted file mode 100644
index 8d33790d29..0000000000
--- a/multimedia/MPlayer/url_fix_20080120.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur MPlayer-1.0rc2.orig/stream/url.c MPlayer-1.0rc2/stream/url.c
---- MPlayer-1.0rc2.orig/stream/url.c 2007-10-07 14:49:26.000000000 -0500
-+++ MPlayer-1.0rc2/stream/url.c 2008-02-01 10:04:09.851900575 -0600
-@@ -328,6 +328,7 @@
- }
- }
-
-+ tmp = NULL;
- while(i < len) {
- // look for the next char that must be kept
- for (j=i;j<len;j++) {