diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-17 17:07:32 -0300 |
commit | 87b9cca463a1dbf2b5026c9dc770b5591b2d3fdc (patch) | |
tree | e3d31e01c79dc0e68742716887ed07c5f6a1015e /libre/mplayer-libre | |
parent | c09bfc90e874607edab8e77d50d9aa15ea145b53 (diff) | |
parent | 35e9f8bc93db9e691bf6d00950956ca3e5d86e83 (diff) |
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts:
community/acpi/PKGBUILD
community/alure/PKGBUILD
community/ario/PKGBUILD
community/cantata/PKGBUILD
community/cgit/PKGBUILD
community/chntpw/PKGBUILD
community/clamz/PKGBUILD
community/deadbeef/PKGBUILD
community/dunst/PKGBUILD
community/erlang/PKGBUILD
community/ettercap/PKGBUILD
community/fcitx-mozc/PKGBUILD
community/gnome-commander/PKGBUILD
community/gq/PKGBUILD
community/gtkimageview/PKGBUILD
community/i3status/PKGBUILD
community/iasl/PKGBUILD
community/krename/PKGBUILD
community/libesmtp/PKGBUILD
community/liblinebreak/PKGBUILD
community/libmilter/PKGBUILD
community/libpaper/PKGBUILD
community/libvirt/PKGBUILD
community/libx86emu/PKGBUILD
community/libxdg-basedir/PKGBUILD
community/lightdm-gtk2-greeter/PKGBUILD
community/lightdm-gtk3-greeter/PKGBUILD
community/lightdm/PKGBUILD
community/luakit/PKGBUILD
community/lxtask/PKGBUILD
community/marisa/PKGBUILD
community/megaglest/PKGBUILD
community/mumble/PKGBUILD
community/opencolorio/PKGBUILD
community/openssh-askpass/PKGBUILD
community/pdf2svg/PKGBUILD
community/pidgin-toobars/PKGBUILD
community/powerdns/PKGBUILD
community/python-numexpr/PKGBUILD
community/python-pybox2d/PKGBUILD
community/python-pytables/PKGBUILD
community/python2-imaging/PKGBUILD
community/python2-pybluez/PKGBUILD
community/remmina/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/ruby-iconv/PKGBUILD
community/scummvm-tools/PKGBUILD
community/shapelib/PKGBUILD
community/sshfs/PKGBUILD
community/subtle/PKGBUILD
community/teeworlds/PKGBUILD
community/uget/PKGBUILD
community/wireshark/PKGBUILD
community/wxcam/PKGBUILD
community/wxgtk2.9/PKGBUILD
community/xchm/PKGBUILD
community/xdelta3/PKGBUILD
community/zynaddsubfx/PKGBUILD
core/gcc/PKGBUILD
core/gcc/gcc_mips64el_lib.patch
core/gdbm/PKGBUILD
core/ldns/PKGBUILD
core/pth/PKGBUILD
core/systemd/PKGBUILD
core/wireless_tools/PKGBUILD
elementary/gtk-engine-equinox/PKGBUILD
elementary/postler/PKGBUILD
elementary/vala-010/PKGBUILD
extra/aubio/PKGBUILD
extra/audacity/PKGBUILD
extra/bc/PKGBUILD
extra/cagibi/PKGBUILD
extra/calligra/PKGBUILD
extra/chmlib/PKGBUILD
extra/clamav/PKGBUILD
extra/clisp/PKGBUILD
extra/crypto++/PKGBUILD
extra/cups/PKGBUILD
extra/dhcp/PKGBUILD
extra/ecore/PKGBUILD
extra/edje/PKGBUILD
extra/eet/PKGBUILD
extra/eeze/PKGBUILD
extra/efreet/PKGBUILD
extra/eina/PKGBUILD
extra/eio/PKGBUILD
extra/embryo/PKGBUILD
extra/emotion/PKGBUILD
extra/enlightenment17/PKGBUILD
extra/ethumb/PKGBUILD
extra/evas/PKGBUILD
extra/festival/PKGBUILD
extra/ffcall/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/git/PKGBUILD
extra/gmetadom/PKGBUILD
extra/gnutls/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtkmathview/PKGBUILD
extra/gvfs/PKGBUILD
extra/hugin/PKGBUILD
extra/i8kutils/PKGBUILD
extra/id3lib/PKGBUILD
extra/imagemagick/PKGBUILD
extra/jack/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libaccounts-qt/PKGBUILD
extra/libdvdnav/PKGBUILD
extra/libdvdread/PKGBUILD
extra/libetpan/PKGBUILD
extra/libgadu/PKGBUILD
extra/libmikmod/PKGBUILD
extra/libpst/PKGBUILD
extra/libsecret/PKGBUILD
extra/libssh/PKGBUILD
extra/libvorbis/PKGBUILD
extra/lilv/PKGBUILD
extra/mariadb/PKGBUILD
extra/maxima/PKGBUILD
extra/mesa/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/msmtp/PKGBUILD
extra/obex-data-server/PKGBUILD
extra/openbabel/PKGBUILD
extra/opencv/PKGBUILD
extra/opengtl/PKGBUILD
extra/perl-net-dns/PKGBUILD
extra/perl-socket6/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/pycurl/PKGBUILD
extra/python-geoip/PKGBUILD
extra/qt5/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/sqlite/PKGBUILD
extra/texmacs/PKGBUILD
extra/v4l-utils/PKGBUILD
extra/vigra/PKGBUILD
extra/vim/PKGBUILD
extra/wildmidi/PKGBUILD
extra/wxpython/PKGBUILD
extra/x2goclient/PKGBUILD
extra/xf86-video-siliconmotion/0001-Remove-miInitializeBackingStore.patch
extra/xf86-video-siliconmotion/PKGBUILD
extra/xfce4-taskmanager/PKGBUILD
extra/xine-lib/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xsane/PKGBUILD
extra/zsh/PKGBUILD
libre-testing/unace-libre/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/audacity-libre/PKGBUILD
libre/audex-libre/PKGBUILD
libre/blackbox-libre/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/bumblebee-libre/PKGBUILD
libre/crosstool-ng/PKGBUILD
libre/dvdrip-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/enscript/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/hardinfo/PKGBUILD
libre/kile-libre/PKGBUILD
libre/lesspipe-libre/PKGBUILD
libre/libquicktime-libre/PKGBUILD
libre/linux-libre-tools/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mc-libre/PKGBUILD
libre/mesa-demos-libre/PKGBUILD
libre/midori-libre/PKGBUILD
libre/oss-libre/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/python2-reportlab-libre/PKGBUILD
libre/sdl-libre/PKGBUILD
libre/seamonkey-libre/PKGBUILD
libre/unzip-libre/PKGBUILD
libre/xarchiver-libre/PKGBUILD
libre/xmlstarlet/PKGBUILD
pcr/a2jmidid/PKGBUILD
pcr/amsynth/PKGBUILD
pcr/anyremote/PKGBUILD
pcr/azr3-jack/PKGBUILD
pcr/bambus/PKGBUILD
pcr/bamf2/PKGBUILD
pcr/barnyard2/PKGBUILD
pcr/bison++/PKGBUILD
pcr/bup/PKGBUILD
pcr/din/PKGBUILD
pcr/django-tagging/PKGBUILD
pcr/doxymacs/PKGBUILD
pcr/emacs-js2-mode/PKGBUILD
pcr/eterm/PKGBUILD
pcr/frame/PKGBUILD
pcr/freeipmi/PKGBUILD
pcr/geis/PKGBUILD
pcr/ginn/PKGBUILD
pcr/grail/PKGBUILD
pcr/libast/PKGBUILD
pcr/libdshconfig/PKGBUILD
pcr/networkmanager-openswan/PKGBUILD
pcr/networkmanager-strongswan/PKGBUILD
pcr/openswan/PKGBUILD
pcr/par/PKGBUILD
pcr/snort/PKGBUILD
pcr/strongswan/PKGBUILD
social/batctl/PKGBUILD
social/bip/PKGBUILD
social/bitcoin-daemon/PKGBUILD
social/dropbear/PKGBUILD
social/ffingerd/PKGBUILD
social/haveged/PKGBUILD
social/inadyn-opendns/PKGBUILD
social/liblockfile/PKGBUILD
social/libowfat/PKGBUILD
social/lockfile-progs/PKGBUILD
social/netatalk/PKGBUILD
social/olsrd/PKGBUILD
social/poco/PKGBUILD
social/spectrum/PKGBUILD
social/squirm/PKGBUILD
social/tokyotyrant/PKGBUILD
social/tomoyo-tools/PKGBUILD
Diffstat (limited to 'libre/mplayer-libre')
-rw-r--r-- | libre/mplayer-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/mplayer-libre/cdio-includes.patch | 43 | ||||
-rw-r--r-- | libre/mplayer-libre/include-samba-4.0.patch | 12 | ||||
-rw-r--r-- | libre/mplayer-libre/mplayer.desktop | 22 | ||||
-rw-r--r-- | libre/mplayer-libre/mplayer.install | 11 | ||||
-rw-r--r-- | libre/mplayer-libre/mplayer.png | bin | 1982 -> 0 bytes |
6 files changed, 2 insertions, 90 deletions
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 75a1fefd2..8ca2fda87 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200344 2013-11-26 19:19:01Z bpiotrowski $ +# $Id: PKGBUILD 204039 2014-01-14 12:09:50Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36498 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 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/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 Binary files differdeleted file mode 100644 index 799769335..000000000 --- a/libre/mplayer-libre/mplayer.png +++ /dev/null |