diff options
author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-08-01 19:07:02 -0300 |
---|---|---|
committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-08-01 19:07:02 -0300 |
commit | 906eb058d481ef38069400bb39ccde268b229daf (patch) | |
tree | a30211baf2005dafed8b06d8da9ee2f57aaca92d /libre | |
parent | 499cf845d68351efe3565012ba91752a3fb61086 (diff) | |
parent | 96805b13998f7f404698e18fbccefccdce3dba46 (diff) | |
download | abslibre-906eb058d481ef38069400bb39ccde268b229daf.tar.gz abslibre-906eb058d481ef38069400bb39ccde268b229daf.tar.bz2 abslibre-906eb058d481ef38069400bb39ccde268b229daf.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r-- | libre/audacious-plugins-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/avidemux-libre/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/avidemux-libre/PKGBUILD.WIP | 71 | ||||
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/kdenetwork-kopete-libre/PKGBUILD | 18 | ||||
-rw-r--r-- | libre/kdenetwork-kopete-libre/giflib5.patch | 67 | ||||
-rw-r--r-- | libre/libquicktime-libre/PKGBUILD | 16 | ||||
-rw-r--r-- | libre/libquicktime-libre/ffmpeg2.0.patch | 135 | ||||
-rw-r--r-- | libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch | 34 | ||||
-rw-r--r-- | libre/mplayer-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | libre/mplayer-vaapi-libre/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/mplayer-vaapi-libre/demux-gif.patch | 19 | ||||
-rw-r--r-- | libre/openexr-libre/PKGBUILD | 59 | ||||
-rw-r--r-- | libre/openexr-libre/gcc43.patch | 11 | ||||
-rw-r--r-- | libre/xbmc-libre/PKGBUILD | 4 |
15 files changed, 395 insertions, 85 deletions
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 00398bb39..d6711ac0f 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189804 2013-07-08 12:09:48Z bisson $ +# $Id: PKGBUILD 189986 2013-07-12 14:00:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 475a7a7ec..3cdb513cb 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=avidemux pkgbase=avidemux-libre pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') pkgver=2.5.6 -pkgrel=6.1 +pkgrel=7 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -21,7 +21,9 @@ build() { cd "${srcdir}/${_pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix @@ -74,7 +76,7 @@ package_avidemux-libre-cli() { } package_avidemux-libre-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') replaces=('avidemux-gtk') conflicts=('avidemux-gtk') @@ -97,7 +99,7 @@ package_avidemux-libre-gtk() { } package_avidemux-libre-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI" + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" depends=("avidemux-libre-cli=${pkgver}" 'qt4') replaces=('avidemux-qt') conflicts=('avidemux-qt') diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index c96084eb8..65499e1ef 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -1,36 +1,42 @@ # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.6.1 +_pkgbase=avidemux +pkgbase=avidemux-libre +pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt') +pkgver=2.6.4 pkgrel=1 arch=('i686' 'x86_64') -license=('GPL') +license=('GPL2') url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ 'libvdpau' 'libdca' 'fribidi' 'glu') options=('!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec') -#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) -#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz) +#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c') -build() { -#mv snapshot_8273 ${pkgbase}_${pkgver} - - cd "${srcdir}/${pkgbase}_${pkgver}" +prepare() { +# mv 2.6_snapshot ${_pkgbase}_${pkgver} + cd ${_pkgbase}_${pkgver} sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { + cd ${_pkgbase}_${pkgver} bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins } -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" +package_avidemux-libre-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support" depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' 'faad2: for the corresponding audio decoder plugin' 'opencore-amr: for the corresponding audio decoder plugin' 'jack: for the corresponding audio device plugin' @@ -38,11 +44,14 @@ package_avidemux-cli() { 'sdl: for the corresponding audio device plugin' 'x264: for the corresponding video encoder plugin' 'xvidcore: for the corresponding video encoder plugin' - 'qt: for the QtScript scripting support' + 'qt4: for the QtScript scripting support' 'libdca: for the corresponding audio decoder plugin' 'fribidi: for the corresponding video filter plugin') + provides=('avidemux' 'avidemux-cli') + conflicts=('avidemux' 'avidemux-cli') + replaces=('avidemux' "avidemux-cli=$pkgver") - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildCli; make DESTDIR="${pkgdir}" install) (cd buildCore; make DESTDIR="${pkgdir}" install) (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) @@ -52,32 +61,34 @@ package_avidemux-cli() { install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" } -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') +package_avidemux-libre-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + replaces=('avidemux-gtk') + conflicts=('avidemux-gtk') + provides=("avidemux-gtk=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildGtk; make DESTDIR="${pkgdir}" install) (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" } -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu') +package_avidemux-libre-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support" + depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu') + replaces=('avidemux-qt') + conflicts=('avidemux-qt') + provides=("avidemux-qt=$pkgver") install=avidemux.install - cd "${srcdir}/${pkgbase}_${pkgver}" + cd ${_pkgbase}_${pkgver} (cd buildQt4; make DESTDIR="${pkgdir}" install) (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - - rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json} } diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 8cdf5228e..1a5692b89 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191727 2013-07-29 18:37:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -30,7 +30,7 @@ sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { - cd "${srcdir}"/${_pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 @@ -40,7 +40,6 @@ prepare() { } build() { - cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 3b4295415..4f4f0edf9 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ +# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,25 +6,29 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch - cd ../ -# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch + cd ../../ + # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook" diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/libre/kdenetwork-kopete-libre/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 81165b02d..c78321b25 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $ +# $Id: PKGBUILD 94168 2013-07-15 13:24:41Z bpiotrowski $ # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> @@ -6,19 +6,27 @@ pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=6 +pkgrel=7 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support" arch=('i686' 'x86_64') license=('GPL') url="http://libquicktime.sourceforge.net/" depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2') +makedepends=('mesa-libgl') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') +source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz" + ffmpeg2.0.patch) +sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368' + 'a1c8415e8e7bc04c81b946b9e3746f7d5ef24819135962280c3a7ddb3f2baa2b') provides=("$_pkgname=$pkgver") conflicts=($_pkgname) replaces=($_pkgname) +prepare() { + cd $_pkgname-$pkgver + patch -Np1 -i ../ffmpeg2.0.patch +} + build() { cd "$srcdir/$_pkgname-$pkgver" ./configure --prefix=/usr \ diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-libre/ffmpeg2.0.patch new file mode 100644 index 000000000..6bec4d99a --- /dev/null +++ b/libre/libquicktime-libre/ffmpeg2.0.patch @@ -0,0 +1,135 @@ +Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ +diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h +--- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/ffmpeg.h 2013-07-15 15:05:19.307534593 +0200 +@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + + + #endif ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#define CODEC_FLAG2_STRICT_GOP 0x00000002 ++#define CODEC_FLAG_QP_RD 0x08000000 ++#define CODEC_FLAG_CBP_RD 0x04000000 +diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c +--- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/lqt_ffmpeg.c 2013-07-15 15:19:09.730831655 +0200 +@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1; + PARAM_QSCALE, \ + PARAM_QCOMPRESS, \ + PARAM_QBLUR, \ +- PARAM_QUANTIZER_NOISE_SHAPING, \ + PARAM_TRELLIS + +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \ +- ENCODE_PARAM_VIDEO_QUANTIZER_I, \ +- PARAM_I_QUANT_FACTOR, \ +- PARAM_I_QUANT_OFFSET +- +-#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \ +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, \ +- PARAM_B_QUANT_FACTOR, \ +- PARAM_B_QUANT_OFFSET +- + #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \ + { \ + .name = "frame_types", \ +@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod + ENCODE_PARAM_VIDEO_FRAMETYPES_IPB, + PARAM_FLAG_AC_PRED_MPEG4, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IPB, + PARAM_FLAG_CBP_RD, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_GMC, +@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_dx50[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_h263p[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + PARAM_FLAG_4MV, + ENCODE_PARAM_VIDEO_ME_PRE, +@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod + static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = { + ENCODE_PARAM_VIDEO_FRAMETYPES_IP, + ENCODE_PARAM_VIDEO_RATECONTROL, +- ENCODE_PARAM_VIDEO_QUANTIZER_IP, + ENCODE_PARAM_VIDEO_ME, + ENCODE_PARAM_VIDEO_ME_PRE, + ENCODE_PARAM_VIDEO_MASKING, +diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c +--- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 ++++ b/plugins/ffmpeg/params.c 2013-07-15 15:09:38.214189953 +0200 +@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++#if #if (LIBAVCODEC_VERSION_MAJOR < 55) + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h +--- a/plugins/ffmpeg/params.h 2011-05-11 17:13:39.000000000 +0200 ++++ b/plugins/ffmpeg/params.h 2013-07-15 15:09:04.860858069 +0200 +@@ -177,6 +177,7 @@ the reference. Unused for constant quant + .val_max = { .val_int = 1 }, \ + } + ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_LUMA_ELIM_THRESHOLD \ + { \ + .name = "ff_luma_elim_threshold", \ +@@ -202,6 +203,7 @@ recommendation") \ + chrominamce. Negative values also consider dc \ + coefficient. 7 is JVT recommendation") \ + } ++#endif + + #define PARAM_STRICT_STANDARD_COMPLIANCE \ + { \ +@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b + + /* Does nothing */ + /** Frame types */ ++#if (LIBAVCODEC_VERSION_MAJOR < 55) + #define PARAM_INTER_THRESHOLD \ + { \ + .name = "ff_inter_threshold", \ +@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b + .help_string = TRS("Choose quantization such that noise will be masked by " \ + "similar-frequency content in the image") \ + } ++#endif + + /** Motion estimation */ + #define PARAM_ME_THRESHOLD \ diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch new file mode 100644 index 000000000..c8a527cf3 --- /dev/null +++ b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch @@ -0,0 +1,34 @@ +From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl> +Date: Sun, 14 Jul 2013 10:51:11 +0200 +Subject: [PATCH] demux_gif: declare missing PrintGifError + +Apparently it has been removed from newer Giflib releases. +--- + libmpdemux/demux_gif.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c +index eee7a85..3d761c0 100644 +--- a/libmpdemux/demux_gif.c ++++ b/libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { + + #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') + ++static void PrintGifError(void) ++{ ++ char *Err = GifErrorString(); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); ++} ++ + #ifndef CONFIG_GIF_TVT_HACK + // not supported by certain versions of the library + static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +-- +1.8.3.2 + diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index a49b889bd..36bf2f4ff 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $ +# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -18,15 +18,18 @@ url="http://www.mplayerhq.hu/" options=('!buildflags' '!emptydirs') source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop - cdio-includes.patch) + cdio-includes.patch + 0001-demux_gif-declare-missing-PrintGifError.patch) md5sums=('5e4f0d4d039b0219514cf52ae6da831d' 'c0d6ef795cf6de48e3b87ff7c23f0319' - '7b5be7191aafbea64218dc4916343bbc') + '7b5be7191aafbea64218dc4916343bbc' + '12a2a5b79849d57eab60a1bfec2978c4') prepare() { cd "$srcdir/$_pkgbase-$pkgver" patch -Np0 -i ../cdio-includes.patch + patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch } build() { diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 6fa12c5c6..9923b356b 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94263 2013-07-18 12:09:29Z foutrelis $ +# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=2 +pkgrel=3 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" @@ -20,7 +20,7 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') +makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver") conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') @@ -28,7 +28,6 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig} cdio-includes.patch tweak-desktop-file.patch - demux-gif.patch subreader-fix-srt-parsing.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install @@ -36,7 +35,6 @@ sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a' 'SKIP' '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b' - '6774f57c027474388497606edfccbb33509cc78b573cdc322dd0955764c6f9c2' '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3') @@ -46,9 +44,6 @@ prepare() { patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" - # https://bugs.archlinux.org/task/36039 - patch -Np0 -i "$srcdir/demux-gif.patch" - # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139 patch -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch" } @@ -61,6 +56,7 @@ build() { --enable-runtime-cpudetection \ --disable-gui \ --disable-arts \ + --disable-gif \ --disable-liblzo \ --enable-speex \ --disable-cdparanoia \ diff --git a/libre/mplayer-vaapi-libre/demux-gif.patch b/libre/mplayer-vaapi-libre/demux-gif.patch deleted file mode 100644 index 68add7d28..000000000 --- a/libre/mplayer-vaapi-libre/demux-gif.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libmpdemux/demux_gif.c-old 2012-08-20 08:47:01.000000000 -0600 -+++ libmpdemux/demux_gif.c 2013-07-05 11:27:55.488387360 -0600 -@@ -45,6 +45,16 @@ - - #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') - -+static void PrintGifError(void) -+{ -+ char *Err = GifErrorString(); -+ -+ if (Err != NULL) -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); -+ else -+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); -+} -+ - #ifndef CONFIG_GIF_TVT_HACK - // not supported by certain versions of the library - static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD new file mode 100644 index 000000000..ff25fb014 --- /dev/null +++ b/libre/openexr-libre/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=openexr +pkgname=openexr-libre +pkgver=2.0.1 +pkgrel=1 +pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation" +url="http://www.openexr.com/" +arch=('i686' 'x86_64' 'mips64el') +license=('BSD') +depends=('zlib' 'ilmbase') +makedepends=('libreoffice-writer' 'jre7-openjdk-headless' 'libcups' 'libxinerama') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +options=('!libtool') +source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" + "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") +noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # remove documentation with embedded nonfree fonts + rm -rv "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.pdf + + # add source documentation with free fonts + install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc + + # convert documentation to pdf format + cd doc + + for x in ${noextract[@]}; do + libreoffice --headless --invisible --convert-to pdf ${x} + done + + cd .. + + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + + install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" +} +md5sums=('4387e6050d2faa65dd5215618ff2ddce' + '69f117d3c91827e5de47f1e00137a4cc' + '4d5ffa31f9af63bd5c621c6cbac6c673' + 'de099240193d8a51086dfae914fff3cf' + 'ece8bf90d438b89c6bd9fe4a89cc318a') diff --git a/libre/openexr-libre/gcc43.patch b/libre/openexr-libre/gcc43.patch new file mode 100644 index 000000000..ab99eb9a1 --- /dev/null +++ b/libre/openexr-libre/gcc43.patch @@ -0,0 +1,11 @@ +--- exrenvmap/blurImage.cpp ++++ exrenvmap/blurImage.cpp +@@ -39,6 +39,8 @@ + // + //----------------------------------------------------------------------------- + ++#include <cstring> ++ + #include <blurImage.h> + + #include <resizeImage.h> diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 4bf584f15..cb48c5d90 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ +# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -10,7 +10,7 @@ _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre pkgver=12.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation" arch=('i686' 'x86_64') url="http://xbmc.org" |