summaryrefslogtreecommitdiff
path: root/libre/mplayer-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-26 07:04:44 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-08-26 07:04:44 -0300
commit224ff53c78c2e8df8c6ac3f5b84964a9fd228ee3 (patch)
tree21f0f00d6ca7a856bde8310b4558a527717a6d85 /libre/mplayer-libre
parent317a3b1d822c252c9f341170cf47a85d72cddde6 (diff)
add parabola suffix on some packages
Diffstat (limited to 'libre/mplayer-libre')
-rw-r--r--libre/mplayer-libre/PKGBUILD129
-rw-r--r--libre/mplayer-libre/cdio-includes.patch43
-rw-r--r--libre/mplayer-libre/giflib51.patch24
-rw-r--r--libre/mplayer-libre/include-samba-4.0.patch12
-rw-r--r--libre/mplayer-libre/mplayer.desktop22
-rw-r--r--libre/mplayer-libre/mplayer.install11
-rw-r--r--libre/mplayer-libre/mplayer.pngbin1982 -> 0 bytes
-rw-r--r--libre/mplayer-libre/revert-icl-fixes.patch66
8 files changed, 0 insertions, 307 deletions
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
deleted file mode 100644
index 50fa504c4..000000000
--- a/libre/mplayer-libre/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 218200 2014-07-26 16:31:03Z bpiotrowski $
-# Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
-# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Márcio Silva <coadde@parabola.nu>
-
-_pkgbase=mplayer
-pkgbase=mplayer-libre
-pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=37224
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=(
- 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
- 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
- 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
- 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
- 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
- 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264'
-)
-license=('GPL')
-url='http://www.mplayerhq.hu/'
-options=('!buildflags' '!emptydirs')
-source=($_pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
- http://ffmpeg.org/releases/ffmpeg-2.2.5.tar.bz2
- mplayer.desktop
- cdio-includes.patch
- include-samba-4.0.patch
- giflib51.patch
- revert-icl-fixes.patch)
-md5sums=('SKIP'
- 'a91dbd963f0ed16bf0eacaba98439d00'
- '62f44a58f072b2b1a3c3d3e4976d64b3'
- '7b5be7191aafbea64218dc4916343bbc'
- '868a92bdef148df7f38bfa992b26ce9d'
- '14461fb94b7aa5dda091ba4f737df2d9'
- '3579402002b7302fdf2d146639333efd')
-
-pkgver() {
- cd $_pkgbase-$pkgver
- svnversion
-}
-
-prepare() {
- cd $_pkgbase-$pkgver
- mv ../ffmpeg-2.2.5 ./ffmpeg
-
- patch -p0 -i ../cdio-includes.patch
- patch -p1 -i ../include-samba-4.0.patch
- patch -Np0 -i ../giflib51.patch
- patch -Np0 -i ../revert-icl-fixes.patch
-
- ./version.sh
-}
-
-build() {
- cd $_pkgbase-$pkgver
-
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-gui \
- --disable-arts \
- --disable-liblzo \
- --disable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --disable-ass-internal \
- --disable-faac \
- --disable-cdparanoia \
- --enable-xvmc \
- --enable-radio \
- --enable-radio-capture \
- --enable-smb \
- --language=all \
- --confdir=/etc/mplayer
- [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
-
- make
-}
-
-package_mplayer-libre() {
- pkgdesc='Media player for GNU/Linux, without nonfree faac support'
- install=mplayer.install
- backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
- depends=(
- 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
- 'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
- 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
- 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
- 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
- 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
- )
- provides=("mplayer=$pkgver")
- replaces=('mplayer')
- conflicts=('mplayer')
-
- cd $_pkgbase-$pkgver
- make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
- "$pkgdir/etc/mplayer/"
-
- # desktop file (FS#14770)
- install -Dm644 ../mplayer.desktop \
- "$pkgdir"/usr/share/applications/mplayer.desktop
- install -Dm644 etc/mplayer256x256.png \
- "$pkgdir"/usr/share/pixmaps/mplayer.png
-}
-
-package_mencoder-libre() {
- pkgdesc='Free command line video decoding, encoding and filtering tool, without nonfree faac support'
- depends=(
- 'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
- 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
- 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
- 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
- 'libvorbis' 'opus'
- )
- provides=("mencoder=$pkgver")
- replaces=('mencoder')
- conflicts=('mencoder')
-
- make -C $_pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
-}
diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch
deleted file mode 100644
index f71472812..000000000
--- a/libre/mplayer-libre/cdio-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure (revision 35421)
-+++ configure (working copy)
-@@ -5968,8 +5968,8 @@
- cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
- void *test = cdda_verbose_set;
- printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c (revision 35421)
-+++ gui/win32/interface.c (working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c (revision 35421)
-+++ stream/stream_cdda.c (working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/libre/mplayer-libre/giflib51.patch b/libre/mplayer-libre/giflib51.patch
deleted file mode 100644
index e884b39f1..000000000
--- a/libre/mplayer-libre/giflib51.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libvo/vo_gif89a.c.orig 2014-06-11 10:06:29.243216331 +0000
-+++ libvo/vo_gif89a.c 2014-06-11 10:08:37.346078847 +0000
-@@ -75,6 +75,9 @@
- #define MakeMapObject GifMakeMapObject
- #define FreeMapObject GifFreeMapObject
- #define QuantizeBuffer GifQuantizeBuffer
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
-+#endif
- #endif
-
- // how many frames per second we are aiming for during output.
---- libmpdemux/demux_gif.c.orig 2014-06-11 10:46:48.120883788 +0000
-+++ libmpdemux/demux_gif.c 2014-06-11 10:47:28.290732272 +0000
-@@ -50,6 +50,9 @@
- #define DGifOpenFileHandle(a) DGifOpenFileHandle(a, NULL)
- #define GifError() (gif ? gif->Error : 0)
- #define GifErrorString() GifErrorString(gif->Error)
-+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
-+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
-+#endif
- #endif
-
- /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */
diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-libre/include-samba-4.0.patch
deleted file mode 100644
index 2ed272b6a..000000000
--- a/libre/mplayer-libre/include-samba-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
-
- #include "config.h"
-
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
-
- #include "mp_msg.h"
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
deleted file mode 100644
index 946b8e345..000000000
--- a/libre/mplayer-libre/mplayer.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
-X-KDE-Protocols=http,ftp,smb
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
deleted file mode 100644
index 660593cf5..000000000
--- a/libre/mplayer-libre/mplayer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/libre/mplayer-libre/mplayer.png b/libre/mplayer-libre/mplayer.png
deleted file mode 100644
index 799769335..000000000
--- a/libre/mplayer-libre/mplayer.png
+++ /dev/null
Binary files differ
diff --git a/libre/mplayer-libre/revert-icl-fixes.patch b/libre/mplayer-libre/revert-icl-fixes.patch
deleted file mode 100644
index e5f049ff5..000000000
--- a/libre/mplayer-libre/revert-icl-fixes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: libmpcodecs/vf_fspp.c
-===================================================================
---- libmpcodecs/vf_fspp.c (revision 37183)
-+++ libmpcodecs/vf_fspp.c (revision 37181)
-@@ -1598,10 +1598,6 @@
-
- : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps)
- : "d"(thr_adr)
-- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433,
-- ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065)
-- NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065,
-- MM_FIX_1_082392200)
- : "%"REG_a
- );
- }
-@@ -1871,8 +1867,6 @@
-
- : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps)
- : "a"(output_stride*sizeof(short))
-- NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200,
-- MM_FIX_1_414213562,MM_DESCALE_RND)
- : "%"REG_d
- );
- }
-@@ -1980,10 +1974,10 @@
- "movd (%%"REG_S",%%"REG_a",2), %%mm3 \n\t" //5
- "paddw %%mm4, %%mm1 \n\t"
-
-- "movq %%mm5, %3 \n\t" //t7
-+ "movq %%mm5, 0*8+%3 \n\t" //t7
- "punpcklbw %%mm7, %%mm3 \n\t"
-
-- "movq %%mm6, %4 \n\t" //t6
-+ "movq %%mm6, 1*8+%3 \n\t" //t6
- "movq %%mm2, %%mm4 \n\t"
-
- "movd (%%"REG_S"), %%mm5 \n\t" //3
-@@ -2029,7 +2023,7 @@
- "psubw %%mm1, %%mm5 \n\t" //d1
- "movq %%mm0, %%mm6 \n\t"
-
-- "movq %4, %%mm1 \n\t"
-+ "movq 1*8+%3, %%mm1 \n\t"
- "punpcklwd %%mm5, %%mm0 \n\t"
-
- "punpckhwd %%mm5, %%mm6 \n\t"
-@@ -2053,7 +2047,7 @@
- "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
- "psllw $2, %%mm3 \n\t" //t10
-
-- "movq %3, %%mm2 \n\t"
-+ "movq 0*8+%3, %%mm2 \n\t"
- "psllw $2, %%mm4 \n\t" //t11
-
- "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3
-@@ -2116,9 +2110,8 @@
- "dec %%"REG_c" \n\t"
- "jnz 6b \n\t"
-
-- : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1])
-+ : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps)
- : "a"(line_size)
-- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965)
- : "%"REG_d);
- }
-