Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/hostapd/PKGBUILD
	community/discid/PKGBUILD
	community/dumb/PKGBUILD
	community/dynamite/PKGBUILD
	community/echat/PKGBUILD
	community/fbdump/PKGBUILD
	community/fldiff/PKGBUILD
	community/flightgear/PKGBUILD
	community/fonteditfs/PKGBUILD
	community/freehdl/PKGBUILD
	community/unclutter/PKGBUILD
	community/unpaper/PKGBUILD
	community/wmii/PKGBUILD
	community/xkeycaps/PKGBUILD
	community/xl2tpd/PKGBUILD
	community/xmmsctrl/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/inkscape/PKGBUILD
	extra/ntp/PKGBUILD
	extra/transmission/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	testing/libreoffice/PKGBUILD

7 files changed, 0 insertions, 296 deletions

diff --git a/community-staging/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD
deleted file mode 100644
index 2c470fcf7..000000000
--- a/community-staging/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 64836 2012-02-18 16:07:27Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.1
-pkgrel=5
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
-             'libsamplerate')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'ffmpeg: for WMA, AA, OMA, AC, etc.'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch'
-        'deadbeef-0.5.1-ffmpeg-version-check-fix.patch')
-md5sums=('be8359d1bd9cf7679cf2ca748996e726'
-         'd1c913c0ccefef33012732cf0ae49f7f'
-         '6d22855f61f4d2fea4b343dca76d5e85')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
-  patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
deleted file mode 100644
index db1c79638..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Mon, 4 Jul 2011 16:47:25 +0400
-Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
-
-For ffmpeg < 0.5.  Copied from libavutil 0.5.
-
-ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
-
-fixes build with lavc 53.
-
-ffmpeg: fix erroneous version comparisons
-
-Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
-(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
-
-ffmpeg: use av_register_protocol2() if available
-
-fixes usage with ffmpeg-0.8
----
- plugins/ffmpeg/ffmpeg.c |   37 ++++++++++++++++++++++++++++++-------
- 1 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index cd7edf4..0cb9955 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -44,6 +44,10 @@
- #define av_register_protocol register_protocol
- #endif
- 
-+#ifndef AV_VERSION_INT
-+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#endif
-+
- #endif
- 
- //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
-             int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-             int len;
-             //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
--            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
--#else
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
-             len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-+#else
-+            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
- #endif
-             trace ("out: out_size=%d, len=%d\n", out_size, len);
-             if (len <= 0) {
-@@ -418,7 +427,7 @@ static const char *map[] = {
- 
- static int
- ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
--#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
-     if (!strlen (fctx->title)) {
-         // title is empty, this call will set track title to filename without extension
-         deadbeef->pl_add_meta (it, "title", NULL);
-@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -704,7 +718,11 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+    av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-+#else
-     av_register_protocol (&vfswrapper);
-+#endif
-     return 0;
- }
- 
-@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
deleted file mode 100644
index af8c282c0..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Thu, 7 Jul 2011 22:31:44 +0400
-Subject: [PATCH 2/2] ffmpeg: version check fix
-
----
- plugins/ffmpeg/ffmpeg.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 0cb9955..37c7e80 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -718,7 +718,7 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
-     av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
- #else
-     av_register_protocol (&vfswrapper);
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install
deleted file mode 100644
index eaf1b9a69..000000000
--- a/community-staging/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,14 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/gmerlin/PKGBUILD b/community-staging/gmerlin/PKGBUILD
deleted file mode 100644
index b22b4df13..000000000
--- a/community-staging/gmerlin/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 65037 2012-02-20 02:14:10Z allan $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=gmerlin
-pkgver=1.0.0
-pkgrel=6
-pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
-url="http://openmovieeditor.sourceforge.net/HomePage"
-license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
-makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
-optdepends=('alsa-lib: for ALSA support'
-	    'jack: for JACK support'
-	    'libquicktime: for movie encoding'
-	    'pulseaudio: for PulseAudio support'
-	    'v4l-utils: for video conversion')
-options=('!libtool' '!makeflags')
-install=gmerlin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	libpng.patch)
-md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
-         'c262023434246705296d97bc7337a212')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  rm -rf cpuinfo.sh
-
-  patch -p1 -i "$srcdir/libpng.patch"
-  ./configure --prefix=/usr --without-doxygen
-  sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile
-  sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gmerlin/gmerlin.install b/community-staging/gmerlin/gmerlin.install
deleted file mode 100644
index c7625c2f1..000000000
--- a/community-staging/gmerlin/gmerlin.install
+++ /dev/null
@@ -1,25 +0,0 @@
-infodir=usr/share/info
-filelist=(gmerlin.info)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/gmerlin/libpng.patch b/community-staging/gmerlin/libpng.patch
deleted file mode 100644
index c01105e63..000000000
--- a/community-staging/gmerlin/libpng.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c
---- gmerlin-1.0.0/plugins/png/ir_png.c	2011-01-07 18:37:06.000000000 +0300
-+++ gmerlin-1.0.0.my/plugins/png/ir_png.c	2011-11-07 14:46:25.000000000 +0400
-@@ -127,13 +127,8 @@
-         bits = 16;
-         }
-       if(bit_depth < 8)
--#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9)
--        png_set_gray_1_2_4_to_8(png->png_ptr);
--#else
-       png_set_expand_gray_1_2_4_to_8(png->png_ptr);
--#endif
- 
--        png_set_gray_1_2_4_to_8(png->png_ptr);
-       if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS))
-         {
-         png_set_tRNS_to_alpha(png->png_ptr);