diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-03 17:45:52 +0200 |
commit | 513c776d74c56a49781a09a5a772f4ea6d6bb401 (patch) | |
tree | 161509e3271db459f14f8c69de7c52d4902ba107 /community/ffmpegsource | |
parent | 8183144fe6e064d80985ac810f6178a3cf289d0d (diff) | |
parent | e191a289464c21aafe7478065ea7ed3ddda0766f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arm-elf-binutils/PKGBUILD
community/bird/PKGBUILD
community/cantata/PKGBUILD
community/dbmail/PKGBUILD
community/ekg2/PKGBUILD
community/ffmpeg-compat/PKGBUILD
community/gigedit/PKGBUILD
community/gimp-refocus/PKGBUILD
community/gmime24/PKGBUILD
community/gmpc/PKGBUILD
community/gnash/PKGBUILD
community/id3lib-rcc/PKGBUILD
community/linuxsampler/PKGBUILD
community/lwm/PKGBUILD
community/midori/PKGBUILD
community/mplayer2/PKGBUILD
community/mtpaint/PKGBUILD
community/nestopia/PKGBUILD
community/preload/PKGBUILD
community/projectm/PKGBUILD
community/rusxmms/PKGBUILD
community/taglib-rcc/PKGBUILD
community/the_silver_searcher/PKGBUILD
community/xnee/PKGBUILD
core/libgcrypt/PKGBUILD
core/libusbx/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
extra/a2ps/PKGBUILD
extra/a52dec/PKGBUILD
extra/abook/PKGBUILD
extra/avidemux/PKGBUILD
extra/bzflag/PKGBUILD
extra/cln/PKGBUILD
extra/exempi/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/fluxter/PKGBUILD
extra/fontforge/PKGBUILD
extra/glib/PKGBUILD
extra/gnet/PKGBUILD
extra/gnome-vfs/PKGBUILD
extra/gnutls/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk/PKGBUILD
extra/idnkit/PKGBUILD
extra/ilmbase/PKGBUILD
extra/imake/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/libdatrie/PKGBUILD
extra/libmbim/PKGBUILD
extra/libmp3splt/PKGBUILD
extra/libqmi/PKGBUILD
extra/libtxc_dxtn/PKGBUILD
extra/libxfont/PKGBUILD
extra/mesa/PKGBUILD
extra/modemmanager/PKGBUILD
extra/nedit/PKGBUILD
extra/nmap/PKGBUILD
extra/openexr/PKGBUILD
extra/purple-plugin-pack/PKGBUILD
extra/qemu/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/subversion/PKGBUILD
extra/transmission/PKGBUILD
extra/truecrypt/PKGBUILD
extra/vigra/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/wireshark/PKGBUILD
extra/wxmaxima/PKGBUILD
extra/x264/PKGBUILD
extra/xorg-iceauth/PKGBUILD
extra/xorg-mkfontscale/PKGBUILD
extra/xorg-xfd/PKGBUILD
libre/abuse-libre/PKGBUILD
libre/clementine-libre/PKGBUILD
libre/linux-libre/PKGBUILD
Diffstat (limited to 'community/ffmpegsource')
-rwxr-xr-x | community/ffmpegsource/PKGBUILD | 6 | ||||
-rwxr-xr-x | community/ffmpegsource/autoconf.patch | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD index c434b18b0..872078081 100755 --- a/community/ffmpegsource/PKGBUILD +++ b/community/ffmpegsource/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88204 2013-04-13 20:20:33Z alucryd $ +# $Id: PKGBUILD 94878 2013-08-01 06:54:52Z bpiotrowski $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> pkgname=ffmpegsource -pkgver=753 +pkgver=755 pkgrel=1 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool') source=("${pkgname}::svn+http://ffmpegsource.googlecode.com/svn/trunk/" 'autoconf.patch') sha256sums=('SKIP' - 'b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93') + '2cfa7d2e0219a5c8df9a50fe2460a1a1e6b69df10e6d9eee1d723766e62535e7') pkgver() { cd "${SRCDEST}"/${pkgname} diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch index e15e4522c..2ed0d0f6e 100755 --- a/community/ffmpegsource/autoconf.patch +++ b/community/ffmpegsource/autoconf.patch @@ -9,14 +9,3 @@ lib_LTLIBRARIES = src/core/libffms2.la src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@ ---- a/configure.ac -+++ b/configure.ac -@@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then - CXXFLAGS="$OPT_FLAGS" - fi - --AM_CONFIG_HEADER([src/config/config.h]) -+AC_CONFIG_HEADERS([src/config/config.h]) - AC_PROG_CC - AC_PROG_CXX - LT_INIT([static disable-shared]) |