Browse Source

fake:


			
			
				rocklinux
			
			
		
fake 20 years ago
parent
commit
e17aee8a1d
4 changed files with 13 additions and 86 deletions
  1. +0
    -62
      package/jimmy/mplayer/head.patch
  2. +0
    -17
      package/jimmy/mplayer/hotfix_rtsp.patch
  3. +10
    -4
      package/jimmy/mplayer/mplayer.conf
  4. +3
    -3
      package/jimmy/mplayer/mplayer.desc

+ 0
- 62
package/jimmy/mplayer/head.patch

@ -1,62 +0,0 @@
# --- 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/head.patch
# ROCK Linux is Copyright (C) 1998 - 2004 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 ---
--- ./configure.orig 2004-07-15 00:04:42.000000000 +0200
+++ ./configure 2004-08-12 06:30:02.000000000 +0200
@@ -513,7 +513,7 @@
if test "$_skip_cc_check" != yes ; then
for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
echocheck "$_cc version"
- cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
+ cc_name=`( $_cc -v ) 2>&1 | tail -n1 | cut -d ' ' -f 1`
cc_version=`( $_cc -dumpversion ) 2>&1`
if test "$?" -gt 0; then
cc_version="not found"
@@ -623,15 +623,15 @@
_def_arch="#define ARCH_X86 1"
_target_arch="TARGET_ARCH_X86 = yes"
- pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
- pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
- pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
- pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
+ pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n1`
+ pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
+ pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
+ pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
+ pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n1`
- pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
+ pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n1`
if test -z "$pparam" ; then
- pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
+ pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n1`
fi
_mmx=no
@@ -884,7 +884,7 @@
echocheck "CPU type"
if linux && test -n "$_cpuinfo"; then
- proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -1`
+ proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -n1`
if test -n "`$_cpuinfo | grep altivec`"; then
_altivec=yes
fi

+ 0
- 17
package/jimmy/mplayer/hotfix_rtsp.patch

@ -1,17 +0,0 @@
Frank van der Loo (18 Jul 2004)
MPlayer doesn't work with the latest LIVE.COM streaming because
the destructor ~UsageEnvironment() from LIVE.COM is now protected.
Now the public method "reclaim()" has to be used. So, instead of
"delete env", now "env->reclaim()" has to be used in demux_rtp.cpp.
--- ./libmpdemux/demux_rtp.cpp.orig 2004-10-13 10:09:53.000000000 -0300
+++ ./libmpdemux/demux_rtp.cpp 2004-10-13 10:10:27.000000000 -0300
@@ -407,7 +407,7 @@
delete rtpState->sdpDescription;
delete rtpState;
- delete env; delete scheduler;
+ env->reclaim(); delete scheduler;
}
////////// Extra routines that help implement the above interface functions:

+ 10
- 4
package/jimmy/mplayer/mplayer.conf

@ -31,9 +31,10 @@ mplayer_premake() {
mplayer_postmake() { mplayer_postmake() {
if pkginstalled gtk+12 ; then if pkginstalled gtk+12 ; then
echo "extracting the default GUI ..."
echo "extracting the standard GUI ..."
mkdir -p $datadir/$pkg/Skin mkdir -p $datadir/$pkg/Skin
tar $taropt $archdir/default-1.7.tar.bz2 -C $datadir/$pkg/Skin
tar $taropt $archdir/standard-1.9.tar.bz2 -C $datadir/$pkg/Skin
ln -s $datadir/$pkg/Skin/standard $datadir/$pkg/Skin/default
fi fi
echo "extracting the default font ..." echo "extracting the default font ..."
@ -42,7 +43,7 @@ mplayer_postmake() {
ln -sf font-arial-24-iso-8859-1 $datadir/$pkg/font ln -sf font-arial-24-iso-8859-1 $datadir/$pkg/font
echo "copy/move some documentation ..." echo "copy/move some documentation ..."
cp -fR DOCS/HTML/en/*.{css,html} DOCS/tech $docdir
cp -fR DOCS/* $docdir
mv -f $datadir/$pkg/README* $docdir mv -f $datadir/$pkg/README* $docdir
echo "create a default configuration ..." echo "create a default configuration ..."
@ -84,10 +85,15 @@ if test "$ROCKCFG_PKG_MPLAYER_BLINKENLIGHTS" != 0 ; then
var_append confopt " " "--enable-bl" var_append confopt " " "--enable-bl"
fi fi
pkginstalled rtsp && var_append confopt " " "--enable-live"
pkginstalled rtsp && var_append confopt " " "--enable-live --with-livelibdir=$libdir/live"
pkginstalled xmms && var_append confopt " " "--enable-xmms" pkginstalled xmms && var_append confopt " " "--enable-xmms"
pkginstalled gtk+12 && var_append confopt " " "--enable-gui" pkginstalled gtk+12 && var_append confopt " " "--enable-gui"
test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n" test "$ROCKCFG_DISABLE_NLS" = 0 || var_append confopt " " "--disable-i18n"
if pkginstalled directfb ; then
var_append confopt ' ' '--enable-directfb'
var_append CFLAGS ' ' "-I$root/usr/include/directfb"
fi
hook_add premake 3 mplayer_premake hook_add premake 3 mplayer_premake
hook_add postmake 5 mplayer_postmake hook_add postmake 5 mplayer_postmake

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

@ -40,9 +40,9 @@
[L] GPL [L] GPL
[S] Beta [S] Beta
[V] 1.0pre5try2
[V] 1.0pre6
[P] X -?---5---9 179.600 [P] X -?---5---9 179.600
[D] 3957331757 MPlayer-1.0pre5try2.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[D] 1060223231 default-1.7.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/
[D] 480755660 MPlayer-1.0pre6.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[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/ [D] 1043513727 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/

Loading…
Cancel
Save