[arch-commits] Commit in ffmpegsource/trunk (PKGBUILD enable-libavresample.patch)
Date: Saturday, April 13, 2013 @ 22:20:12
Author: alucryd
Revision: 88203
upgpkg: ffmpegsource 753-1
Modified:
ffmpegsource/trunk/PKGBUILD
Deleted:
ffmpegsource/trunk/enable-libavresample.patch
+
PKGBUILD | 48 --
enable-libavresample.patch | 970 ---
2 files changed, 17 insertions(+), 1001 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-13 19:43:05 UTC (rev 88202)
+++ PKGBUILD2013-04-13 20:20:12 UTC (rev 88203)
@@ -2,8 +2,8 @@
# Maintainer: Maxime Gauduin
pkgname=ffmpegsource
-pkgver=743
-pkgrel=2
+pkgver=753
+pkgrel=1
pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy
frame accurate access"
arch=('i686' 'x86_64')
url="http://code.google.com/p/ffmpegsource/";
@@ -11,49 +11,35 @@
depends=('ffmpeg')
makedepends=('svn')
options=('!libtool')
-source=('autoconf.patch' 'enable-libavresample.patch')
-sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93'
-'05f03515cc2405cdf8a8ba835f5adc2057f40054a4a1d9e493f0ad512c5de70d')
+source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/";
+'autoconf.patch')
+sha256sums=('SKIP'
+'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
-_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
-_svnmod=ffmpegsource
+pkgver() {
+ cd "${SRCDEST}"/${pkgname}
-build() {
- cd "${srcdir}"
+ svnversion | tr -d [A-z]
+}
-# Checkout
- msg "Connecting to SVN server"
+prepare() {
+ cd "${srcdir}"/${pkgname}
- if [[ -d ${_svnmod}/.svn ]]; then
-(cd ${_svnmod} && svn up -r ${pkgver})
- else
-svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
- fi
+ patch -Np1 -i ../autoconf.patch
+}
- msg "SVN checkout done or server timeout"
- msg "Starting build..."
+build() {
+ cd "${srcdir}"/${pkgname}
- rm -rf "${srcdir}"/${_svnmod}-build
-# svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
- cp -R "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
- cd "${srcdir}"/${_svnmod}-build
-
-# Patch
- patch -Np1 -i "${srcdir}"/autoconf.patch
- patch -Np1 -i "${srcdir}"/enable-libavresample.patch
-
-# Build
./autogen.sh --prefix=/usr --enable-shared --disable-static
make
}
package() {
- cd "${srcdir}"/${_svnmod}-build
+ cd "${srcdir}"/${pkgname}
-# Install
make DESTDIR="${pkgdir}" install
-# License
install -dm 755 "${pkgdir}"/usr/share/licenses/ffmpegsource
install -m 644 COPYING "${pkgdir}"/usr/share/licenses/ffmpegsource/LICENSE
}
Deleted: enable-libavresample.patch
===
--- enable-libavresample.patch 2013-04-13 19:43:05 UTC (rev 88202)
+++ enable-libavresample.patch 2013-04-13 20:20:12 UTC (rev 88203)
@@ -1,970 +0,0 @@
-# enable-libavresample.patch
-#
-# Adds libavresample support. Created by diffing Thomas Goyne's GIT repo
-# with official ffms SVN.
-#
-
-diff -ru ffmpegsource/configure.ac ffms2/configure.ac
ffmpegsource/configure.ac 2013-02-27 16:53:39.230691825 +0100
-+++ ffms2/configure.ac 2013-02-27 16:53:31.737713841 +0100
-@@ -181,6 +181,25 @@
- AC_MSG_RESULT([no])
- ])
-
-+AC_ARG_ENABLE(avresample,
-+ AS_HELP_STRING([--enable-avresample],
-+ [use libavresample for audio resampling]))
-+AS_IF([test x$enable_avresample != xno], [
-+ PKG_CHECK_MODULES(AVRESAMPLE, [libavresample >= 1.0.0],
[enable_avresample=yes], [
-+AS_IF([test x$enable_avresample = xyes],
-+ [AC_MSG_ERROR([--enable-avresample was specified, but avresample
1.0.0+ could not be found.])])
-+enable_avresample=no
-+ ])
-+])
-+
-+AS_IF([test x$enable_avresample],
-+ [libavresample="libavresample"
-+ AC_DEFINE([WITH_AVRESAMPLE], [1], [Use avresample])])
-+
-+AC_SUBST([AVRESAMPLE_CFLAGS])
-+AC_SUBST([AVRESAMPLE_LIBS])
-+AC_SUBST([libavresample])
-+
- AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed])
- if test "$enable_shared" = yes; then
- _LDFLAGS="$LDFLAGS"
-diff -ru ffmpegsource/ffms2.pc.in ffms2/ffms2.pc.in
ffmpegsource/ffms2.pc.in 2013-02-27 16:53:38.924039701 +0100
-+++ ffms2/ffms2.pc.in 2013-02-27 16:53:31.737713841 +0100
-@@ -7,7 +7,7 @@
-
- Name: ffms2
- Description: The Fabulous FM Library 2
--Requires.private: libavformat libavcodec libswscale libavutil
-+Requires.private: libavformat libavcodec libswscale libavutil @libavresample@
- Version: @FFMS_VERSION@
- Libs.private: @ZLIB_LDFLAGS@ -lz
- Libs: -L${libdir} -lffms2
-diff -ru ffmpegsource/include/ffmscompat.h ffms2/include/ffmscompat.h
ffmpegsource/include/ffmscompat.h 2013-02-27 16:53:38.920706525 +0100
-+++ ffms2/include/ffmscompat.h 2013-02-27 16:53:31.737713841 +0100
-@@ -71,6 +71,15 @@
- # define FFMS_CodecID AVCodecID
- # undef CodecID
- # endif
-+# if VERSION_CHECK(LIBAVCODEC_VE
[arch-commits] Commit in ffmpegsource/trunk (PKGBUILD enable-libavresample.patch)
Date: Wednesday, February 27, 2013 @ 19:14:12
Author: alucryd
Revision: 85214
upgpkg: ffmpegsource 743-2
Added:
ffmpegsource/trunk/enable-libavresample.patch
Modified:
ffmpegsource/trunk/PKGBUILD
+
PKGBUILD | 13
enable-libavresample.patch | 970 +++
2 files changed, 979 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-27 18:06:27 UTC (rev 85213)
+++ PKGBUILD2013-02-27 18:14:12 UTC (rev 85214)
@@ -3,7 +3,7 @@
pkgname=ffmpegsource
pkgver=743
-pkgrel=1
+pkgrel=2
pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy
frame accurate access"
arch=('i686' 'x86_64')
url="http://code.google.com/p/ffmpegsource/";
@@ -11,14 +11,17 @@
depends=('ffmpeg')
makedepends=('svn')
options=('!libtool')
-source=('autoconf.patch')
-sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+source=('autoconf.patch' 'enable-libavresample.patch')
+sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93'
+'05f03515cc2405cdf8a8ba835f5adc2057f40054a4a1d9e493f0ad512c5de70d')
_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
_svnmod=ffmpegsource
build() {
cd "${srcdir}"
+
+# Checkout
msg "Connecting to SVN server"
if [[ -d ${_svnmod}/.svn ]]; then
@@ -31,11 +34,13 @@
msg "Starting build..."
rm -rf "${srcdir}"/${_svnmod}-build
- svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+# svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+ cp -R "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
cd "${srcdir}"/${_svnmod}-build
# Patch
patch -Np1 -i "${srcdir}"/autoconf.patch
+ patch -Np1 -i "${srcdir}"/enable-libavresample.patch
# Build
./autogen.sh --prefix=/usr --enable-shared --disable-static
Added: enable-libavresample.patch
===
--- enable-libavresample.patch (rev 0)
+++ enable-libavresample.patch 2013-02-27 18:14:12 UTC (rev 85214)
@@ -0,0 +1,970 @@
+# enable-libavresample.patch
+#
+# Adds libavresample support. Created by diffing Thomas Goyne's GIT repo
+# with official ffms SVN.
+#
+
+diff -ru ffmpegsource/configure.ac ffms2/configure.ac
+--- ffmpegsource/configure.ac 2013-02-27 16:53:39.230691825 +0100
ffms2/configure.ac 2013-02-27 16:53:31.737713841 +0100
+@@ -181,6 +181,25 @@
+ AC_MSG_RESULT([no])
+ ])
+
++AC_ARG_ENABLE(avresample,
++ AS_HELP_STRING([--enable-avresample],
++ [use libavresample for audio resampling]))
++AS_IF([test x$enable_avresample != xno], [
++ PKG_CHECK_MODULES(AVRESAMPLE, [libavresample >= 1.0.0],
[enable_avresample=yes], [
++AS_IF([test x$enable_avresample = xyes],
++ [AC_MSG_ERROR([--enable-avresample was specified, but avresample
1.0.0+ could not be found.])])
++enable_avresample=no
++ ])
++])
++
++AS_IF([test x$enable_avresample],
++ [libavresample="libavresample"
++ AC_DEFINE([WITH_AVRESAMPLE], [1], [Use avresample])])
++
++AC_SUBST([AVRESAMPLE_CFLAGS])
++AC_SUBST([AVRESAMPLE_LIBS])
++AC_SUBST([libavresample])
++
+ AC_MSG_CHECKING([whether -Wl,-Bsymbolic is needed])
+ if test "$enable_shared" = yes; then
+ _LDFLAGS="$LDFLAGS"
+diff -ru ffmpegsource/ffms2.pc.in ffms2/ffms2.pc.in
+--- ffmpegsource/ffms2.pc.in 2013-02-27 16:53:38.924039701 +0100
ffms2/ffms2.pc.in 2013-02-27 16:53:31.737713841 +0100
+@@ -7,7 +7,7 @@
+
+ Name: ffms2
+ Description: The Fabulous FM Library 2
+-Requires.private: libavformat libavcodec libswscale libavutil
++Requires.private: libavformat libavcodec libswscale libavutil @libavresample@
+ Version: @FFMS_VERSION@
+ Libs.private: @ZLIB_LDFLAGS@ -lz
+ Libs: -L${libdir} -lffms2
+diff -ru ffmpegsource/include/ffmscompat.h ffms2/include/ffmscompat.h
+--- ffmpegsource/include/ffmscompat.h 2013-02-27 16:53:38.920706525 +0100
ffms2/include/ffmscompat.h 2013-02-27 16:53:31.737713841 +0100
+@@ -71,6 +71,15 @@
+ # define FFMS_CodecID AVCodecID
+ # undef CodecID
+ # endif
++# if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 28, 0, 54, 59, 100)
++# define avcodec_free_frame av_free
++# endif
++#endif
++
++#ifdef LIBAVUTIL_VERSION_INT
++# if VERSION_CHECK(LIBAVUTIL_VERSION_INT, <, 51, 27, 0, 51, 46, 100)
++# define av_get_packed_sample_fmt(fmt) (fmt < AV_SAMPLE_FMT_U8P ?
fmt : fmt - (AV_SAMPLE_FMT_U8P - AV_SAMPLE_FMT_U8))
++# endif
+ #endif
+
+ #endif // FFMSCOMPAT_H
+diff -ru ffmpegsource/include/ffms.h ffms2/include/ffms.h
+--- ffmpegsource/include/ffms.h2013-02-27 16:53:38.920706525 +0100
ffms2/include/ffms.h 2013-02-27 16:53:31.737713841 +0100
+@@ -113,6 +113,7 @@
+ FFMS_ERROR_TRACK, // track handling
+ FFMS_ERROR_WAVE_
