Browse Source

th:


			
			
				rocklinux
			
			
		
Tobias Hintze 18 years ago
parent
commit
98546c04b9
3 changed files with 7 additions and 48 deletions
  1. +5
    -1
      package/jimmy/mplayer/mplayer.conf
  2. +2
    -2
      package/jimmy/mplayer/mplayer.desc
  3. +0
    -45
      package/jimmy/mplayer/no-altivec2.patch

+ 5
- 1
package/jimmy/mplayer/mplayer.conf

@ -108,7 +108,11 @@ if pkginstalled directfb ; then
var_append CFLAGS ' ' "-I$root/usr/include/directfb"
fi
var_append confopt " " "--enable-tv-v4l2 --enable-tv-v4l"
var_append confopt " " "--enable-tv-v4l2 --enable-tv-v4l1"
# mplayer fails to build with -Os
var_remove GCC_WRAPPER_INSERT " " "-Os"
var_append GCC_WRAPPER_INSERT " " "-O4"
hook_add postmake 5 mplayer_postmake

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

@ -41,10 +41,10 @@
[L] GPL
[S] Beta
[V] 1.0pre8
[V] 1.0rc1
[P] X -?---5---9 181.200
[D] 3636614639 MPlayer-1.0pre8.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
[D] 1951804110 MPlayer-1.0rc1.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/

+ 0
- 45
package/jimmy/mplayer/no-altivec2.patch

@ -1,45 +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/no-altivec2.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 ---
When altivec is disabled there is no swScale_altivec ...
Additionally cleaned up the else case a bit.
- Rene Rebe <rene@exactcode.de>
RUN_CPUDETECT='0' failed, cut down to the bare minimum.
- Dimitar Zhekov <jimmy@is-vn.bg>
--- ./postproc/swscale.c.orig 2004-04-26 22:38:17.000000000 +0300
+++ ./postproc/swscale.c 2004-05-08 12:53:21.000000000 +0300
@@ -1344,10 +1344,11 @@
#else
#ifdef ARCH_POWERPC
+#ifdef HAVE_ALTIVEC
if(flags & SWS_CPU_CAPS_ALTIVEC)
return swScale_altivec;
else
- return swScale_C;
+#endif
#endif
return swScale_C;
#endif

Loading…
Cancel
Save