Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c65d37371b3aedf8c41d2a6071f4dda6579fe969

commit c65d37371b3aedf8c41d2a6071f4dda6579fe969
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Fri Feb 18 01:37:13 2011 +0100

mplayer-1.0rc4-1-i686

- version bump

diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild
index 32b6f69..d38645d 100644
--- a/source/xapps/mplayer/FrugalBuild
+++ b/source/xapps/mplayer/FrugalBuild
@@ -6,10 +6,10 @@ USE_DEVEL=${USE_DEVEL:-"n"}

pkgname=mplayer
_F_archive_name=MPlayer
-pkgver=1.0rc3
+pkgver=1.0rc4
Fuse $USE_DEVEL && pkgver=1.0rc2.29962
pkgextraver=.29962
-pkgrel=3
+pkgrel=1
Fuse $USE_DEVEL && pkgrel=1
pkgdesc="The Movie Player"
url="http://www.mplayerhq.hu/";
@@ -25,22 +25,19 @@ backup=('etc/mplayer/mplayer.conf')
archs=('i686' 'x86_64' 'ppc')
options=('scriptlet' 'force')
up2date="lynx -dump http://www.mplayerhq.hu/MPlayer/releases | Flasttar"
-#source=(http://ftp.frugalware.org/pub/other/sources/mplayer/$_F_archive_name-$pkgver$pkgextraver.tar.bz2
 \
source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.bz2
        \
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \
-       
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \
-       ppc-altivec.diff)
+       
http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2)

-sha1sums=('f533ea1eb2c540402bace0f0fe2317721361510d' \
+sha1sums=('36dfaeda726896b6831d66b0fe179623e0385fbe' \
'45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \
'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \
'152c40bf20de34aa8802d7f80d34d673b0b67212' \
'7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \
-          '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \
-          'df375f7afe673ff1d960139253c93a5927e0f7fb')
+         '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d')

if Fuse $USE_DEVEL; then
source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]})
@@ -66,7 +63,6 @@ build()
if Fuse $USE_DEVEL; then
Funpack_scm
else
-               #Fcd MPlayer-$pkgver$pkgextraver
Fcd $_F_archive_name-$pkgver
fi
unset CFLAGS
diff --git a/source/xapps/mplayer/ppc-altivec.diff 
b/source/xapps/mplayer/ppc-altivec.diff
deleted file mode 100644
index d56a716..0000000
--- a/source/xapps/mplayer/ppc-altivec.diff
+++ /dev/null
@@ -1,71 +0,0 @@
---- MPlayer-1.0rc3/libswscale/swscaleold.c     2010-08-03 11:45:53.000000000 
+0000
-+++ MPlayer-1.0rc3/libswscale/swscale.c        2010-08-03 12:39:52.000000000 
+0000
-@@ -960,8 +960,7 @@
- #endif
-
- #if ARCH_PPC
--#if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL
--#undef COMPILE_C
-+#if HAVE_ALTIVEC
- #define COMPILE_ALTIVEC
- #endif
- #endif //ARCH_PPC
-@@ -1636,41 +1635,44 @@
- }
-
- static SwsFunc getSwsFunc(int flags){
-+#if CONFIG_RUNTIME_CPUDETECT
-+    int flags = c->flags;
-
--#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL
- #if ARCH_X86
-     // ordered per speed fastest first
--    if (flags & SWS_CPU_CAPS_MMX2)
-+    if (flags & SWS_CPU_CAPS_MMX2) {
-         return swScale_MMX2;
--    else if (flags & SWS_CPU_CAPS_3DNOW)
-+    } else if (flags & SWS_CPU_CAPS_3DNOW) {
-         return swScale_3DNow;
--    else if (flags & SWS_CPU_CAPS_MMX)
-+    } else if (flags & SWS_CPU_CAPS_MMX) {
-         return swScale_MMX;
--    else
-+    } else {
-         return swScale_C;
-+    }
-
- #else
--#if ARCH_PPC
--    if (flags & SWS_CPU_CAPS_ALTIVEC)
-+#ifdef COMPILE_ALTIVEC
-+    if (flags & SWS_CPU_CAPS_ALTIVEC) {
-         return swScale_altivec;
--    else
-+    } else {
-         return swScale_C;
-+    }
- #endif
-     return swScale_C;
- #endif /* ARCH_X86 */
--#else //RUNTIME_CPUDETECT
--#if   HAVE_MMX2
-+#else //CONFIG_RUNTIME_CPUDETECT
-+#if   COMPILE_TEMPLATE_MMX2
-     return swScale_MMX2;
--#elif HAVE_AMD3DNOW
-+#elif COMPILE_TEMPLATE_AMD3DNOW
-     return swScale_3DNow;
--#elif HAVE_MMX
-+#elif COMPILE_TEMPLATE_MMX
-     return swScale_MMX;
--#elif HAVE_ALTIVEC
-+#elif COMPILE_TEMPLATE_ALTIVEC
-     return swScale_altivec;
- #else
-     return swScale_C;
- #endif
--#endif //!RUNTIME_CPUDETECT
-+#endif //!CONFIG_RUNTIME_CPUDETECT
- }
-
- static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int 
srcStride[], int srcSliceY,
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to