[arch-commits] Commit in gpac/repos/community-x86_64 (4 files)
Eric Bélanger
eric at archlinux.org
Thu Jan 1 02:26:31 UTC 2015
Date: Thursday, January 1, 2015 @ 03:26:29
Author: eric
Revision: 125101
archrelease: copy trunk to community-x86_64
Added:
gpac/repos/community-x86_64/PKGBUILD
(from rev 125100, gpac/trunk/PKGBUILD)
gpac/repos/community-x86_64/gpac-ffmpeg.patch
(from rev 125100, gpac/trunk/gpac-ffmpeg.patch)
Deleted:
gpac/repos/community-x86_64/PKGBUILD
gpac/repos/community-x86_64/gpac-ffmpeg.patch
-------------------+
PKGBUILD | 107 ++++++++++++++++++++++++++--------------------------
gpac-ffmpeg.patch | 94 ++++++++++++++++++++++-----------------------
2 files changed, 101 insertions(+), 100 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-01 02:25:05 UTC (rev 125100)
+++ PKGBUILD 2015-01-01 02:26:29 UTC (rev 125101)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=gpac
-pkgver=5324
-pkgrel=1
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv')
-makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa')
-optdepends=('jack: for jack support' 'a52dec: for A52 support'
- 'faad2: for AAC support' 'libmad: for mp3 support')
-options=('staticlibs' '!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
-sha1sums=('cd00b88aa6da97708532fc8eb7ab65f6a0d0c1e0'
- 'SKIP'
- 'e758b8cdb0b4bca37134241a1b8ccc33d4deb54a')
-
-# source PKGBUILD && mksource
-mksource() {
- [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
- _svnver=${pkgver}
- _svntrunk="svn://svn.code.sf.net/p/gpac/code/trunk/gpac"
- _svnmod="$pkgname-${pkgver}"
- mkdir ${pkgname}-${pkgver}
- pushd ${pkgname}-${pkgver}
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- revision="$(svnversion ${pkgname}-${pkgver})"
- echo "#define GPAC_SVN_REVISION \"$revision\"" > ${pkgname}-${pkgver}/include/gpac/revision.h
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
- popd
- rm -r ${pkgname}-${pkgver}
- gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p3 -i "${srcdir}/gpac-ffmpeg.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install install-lib
-}
Copied: gpac/repos/community-x86_64/PKGBUILD (from rev 125100, gpac/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-01-01 02:26:29 UTC (rev 125101)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gpac
+pkgver=5324
+pkgrel=1
+pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
+arch=('i686' 'x86_64')
+url="http://gpac.sourceforge.net"
+license=('LGPL')
+depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv')
+makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa')
+optdepends=('jack: for jack support' 'a52dec: for A52 support'
+ 'faad2: for AAC support' 'libmad: for mp3 support')
+options=('staticlibs' '!makeflags')
+source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
+sha1sums=('cd00b88aa6da97708532fc8eb7ab65f6a0d0c1e0'
+ 'SKIP'
+ 'e758b8cdb0b4bca37134241a1b8ccc33d4deb54a')
+validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
+
+# source PKGBUILD && mksource
+mksource() {
+ [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
+ _svnver=${pkgver}
+ _svntrunk="svn://svn.code.sf.net/p/gpac/code/trunk/gpac"
+ _svnmod="$pkgname-${pkgver}"
+ mkdir ${pkgname}-${pkgver}
+ pushd ${pkgname}-${pkgver}
+ svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
+ revision="$(svnversion ${pkgname}-${pkgver})"
+ echo "#define GPAC_SVN_REVISION \"$revision\"" > ${pkgname}-${pkgver}/include/gpac/revision.h
+ find . -depth -type d -name .svn -exec rm -rf {} \;
+ tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
+ popd
+ rm -r ${pkgname}-${pkgver}
+ gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
+}
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p3 -i "${srcdir}/gpac-ffmpeg.patch"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install install-lib
+}
Deleted: gpac-ffmpeg.patch
===================================================================
--- gpac-ffmpeg.patch 2015-01-01 02:25:05 UTC (rev 125100)
+++ gpac-ffmpeg.patch 2015-01-01 02:26:29 UTC (rev 125101)
@@ -1,47 +0,0 @@
---- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
-+++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
-@@ -54,13 +54,10 @@
- #endif /* AVERROR_NOFMT */
-
-
--#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)
-+#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
-
- #define av_find_stream_info(__c) avformat_find_stream_info(__c, NULL)
--#ifndef FF_API_FORMAT_PARAMETERS
--#define FF_API_FORMAT_PARAMETERS 1
--#endif
--
-+#define USE_AVFORMAT_OPEN_INPUT 1
- #endif
-
-
-@@ -275,7 +272,7 @@
- }
- if (!has_audio && !has_video) goto exit;
- ret = 1;
--#if LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45
-+#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
- fmt_out = guess_stream_format(NULL, url, NULL);
- #else
- fmt_out = av_guess_format(NULL, url, NULL);
-@@ -588,7 +585,7 @@
- }
- /*setup downloader*/
- av_in->flags |= AVFMT_NOFILE;
--#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
-+#ifdef USE_AVFORMAT_OPEN_INPUT /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
- res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
- #else
- res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
---- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
-+++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
-@@ -99,7 +99,7 @@
-
- #ifndef FFMPEG_OLD_HEADERS
-
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
-+#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
- #undef USE_AVCODEC2
- #else
- #define USE_AVCODEC2 1
Copied: gpac/repos/community-x86_64/gpac-ffmpeg.patch (from rev 125100, gpac/trunk/gpac-ffmpeg.patch)
===================================================================
--- gpac-ffmpeg.patch (rev 0)
+++ gpac-ffmpeg.patch 2015-01-01 02:26:29 UTC (rev 125101)
@@ -0,0 +1,47 @@
+--- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
++++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_demux.c
+@@ -54,13 +54,10 @@
+ #endif /* AVERROR_NOFMT */
+
+
+-#if (LIBAVFORMAT_VERSION_MAJOR >= 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)
++#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
+
+ #define av_find_stream_info(__c) avformat_find_stream_info(__c, NULL)
+-#ifndef FF_API_FORMAT_PARAMETERS
+-#define FF_API_FORMAT_PARAMETERS 1
+-#endif
+-
++#define USE_AVFORMAT_OPEN_INPUT 1
+ #endif
+
+
+@@ -275,7 +272,7 @@
+ }
+ if (!has_audio && !has_video) goto exit;
+ ret = 1;
+-#if LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45
++#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
+ fmt_out = guess_stream_format(NULL, url, NULL);
+ #else
+ fmt_out = av_guess_format(NULL, url, NULL);
+@@ -588,7 +585,7 @@
+ }
+ /*setup downloader*/
+ av_in->flags |= AVFMT_NOFILE;
+-#if FF_API_FORMAT_PARAMETERS /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
++#ifdef USE_AVFORMAT_OPEN_INPUT /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
+ res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
+ #else
+ res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
+--- a/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
++++ b/trunk/gpac/modules/ffmpeg_in/ffmpeg_in.h
+@@ -99,7 +99,7 @@
+
+ #ifndef FFMPEG_OLD_HEADERS
+
+-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
++#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
+ #undef USE_AVCODEC2
+ #else
+ #define USE_AVCODEC2 1
More information about the arch-commits
mailing list