Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 18 years ago
parent
commit
69b64889c1
3 changed files with 27 additions and 41 deletions
  1. +7
    -26
      package/jimmy/mplayer/inst-shared-pp.patch
  2. +17
    -11
      package/jimmy/mplayer/mplayer.conf
  3. +3
    -4
      package/jimmy/mplayer/mplayer.desc

+ 7
- 26
package/jimmy/mplayer/inst-shared-pp.patch

@ -1,31 +1,12 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/jimmy/mplayer/inst-shared-pp.patch
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2003-12-08 23:33:31.000000000 +0200
+++ ./Makefile 2003-12-20 12:49:52.000000000 +0200
@@ -252,6 +252,9 @@
--- ./Makefile~ 2006-08-15 14:51:16.000000000 +0200
+++ ./Makefile 2006-08-15 14:52:37.000000000 +0200
@@ -186,6 +186,9 @@
ifeq ($(VIDIX),yes)
$(DO_MAKE)
PARTS += libdha vidix
endif
+ifeq ($(SHARED_PP),yes)
+ $(MAKE) install -C libavcodec/libpostproc
+endif
if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
ifeq ($(GUI),yes)
ifeq ($(FAME),yes)
PARTS += libfame
endif

+ 17
- 11
package/jimmy/mplayer/mplayer.conf

@ -20,13 +20,25 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
mplayer_preconf() {
tar $taropt $archdir/MPlayer-${ver}.tar.bz2
tar $taropt $archdir/MPlayer-${ver}-ffmpeg.tar.bz2
mv MPlayer-${ver}-ffmpeg/{libavcodec,libavformat,libavutil} MPlayer-${ver}
cd MPlayer-${ver}
prefer_program ()
{
local P
for P ; do
type -p "$P" >/dev/null && { echo "$P" ; break ; }
done
return
}
preferred_gcc="`prefer_program gcc-34 gcc-33 gcc-32 gcc-2`"
if [ -n "$preferred_gcc" ] ; then
CC="$preferred_gcc" ; HOST_CC="$preferred_gcc"
var_append confopt ' ' "--cc=\"$preferred_gcc\" --host-cc=\"$preferred_gcc\""
elif [ "${ROCKCFG_DEFAULT_CC:3:1}" -gt "3" ] ; then
# only gcc 2.95 and gcc 3.x are officially supported
var_append confopt " " "--disable-gcc-checking"
fi
mplayer_postmake() {
if pkginstalled gtk+12 ; then
echo "extracting the standard GUI ..."
@ -64,8 +76,6 @@ mplayer_postmake() {
find $datadir/$pkg $docdir $sysconfdir -type f | xargs -r chmod 0644
}
autoextract=0
sysconfdir="$sysconfdir/mplayer"
confopt="--prefix=$root/$prefix --confdir=$sysconfdir"
@ -100,10 +110,6 @@ fi
var_append confopt " " "--enable-tv-v4l2 --enable-tv-v4l"
# only gcc 2.95 and gcc 3.x are officially supported
[ "${ROCKCFG_DEFAULT_CC:3:1}" -gt "3" ] && var_append confopt " " "--disable-gcc-checking"
hook_add preconf 3 mplayer_preconf
hook_add postmake 5 mplayer_postmake
# The function was obviously renamed in speex

+ 3
- 4
package/jimmy/mplayer/mplayer.desc

@ -41,11 +41,10 @@
[L] GPL
[S] Beta
[V] 20051210
[V] 1.0pre8
[P] X -?---5---9 181.200
#[D] 1496363492 MPlayer-1.0pre7try2.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[D] X MPlayer-20051210.tar.bz2 cvs://pserver:anonymous@mplayerhq.hu:/cvsroot/mplayer::main/!20051210/
[D] X MPlayer-20051210-ffmpeg.tar.bz2 cvs://pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg::ffmpeg/!20051210/
[D] 3636614639 MPlayer-1.0pre8.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
# [D] X MPlayer-20051210.tar.bz2 cvs://pserver:anonymous@mplayerhq.hu:/cvsroot/mplayer::main/!20051210/
[D] 1799018198 standard-1.9.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/
[D] 1043513727 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/

Loading…
Cancel
Save