updated openjpeg, rebuild group until ffmpeg so far

This commit is contained in:
Fabian 2013-01-26 12:44:26 +00:00
parent eea2b31f57
commit b215f9325e
5 changed files with 38 additions and 9 deletions

View File

@ -5,7 +5,7 @@
pkgname=ffmpeg
pkgver=1.0.1
pkgrel=1
pkgrel=2
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('x86_64')
url="http://ffmpeg.org/"
@ -14,12 +14,20 @@ depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora'
'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx>=1.1.0'
'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm' 'pulseaudio')
makedepends=('yasm')
source=("http://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.bz2")
md5sums=('dbbb88ce5525dea22b24aaa098a9bcc2')
source=("http://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.bz2"
"openjpeg1.5.1.patch"
)
md5sums=('dbbb88ce5525dea22b24aaa098a9bcc2'
'a4b39642b8885e4cd7d4f30bdc043351')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# openjpeg 1.5.1 is installed in a different place than 1.5.0, this patch makes it search there
# patch is from http://patches.libav.org/patch/32269/
# this patch should be unnecessary with newer versions of ffmpeg
mv ../openjpeg1.5.1.patch .
patch < openjpeg1.5.1.patch
./configure --prefix=/usr \
--enable-libmp3lame \
--enable-libvorbis \
@ -54,4 +62,3 @@ package() {
make DESTDIR="${pkgdir}" install install-man
install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
}

View File

@ -0,0 +1,22 @@
---
configure | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index a50d073..f4da5bf 100755
--- a/configure
+++ b/configure
@@ -3837,7 +3837,10 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
-enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
+enabled libopenjpeg && { { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg &&
+ add_cflags -I"$sysinclude"/openjpeg-1.5; } ||
+ check_lib openjpeg.h opj_version -lopenjpeg ||
+ die "ERROR: libopenjpeg not found"; }
enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
--
1.8.0.1

View File

@ -5,7 +5,7 @@
pkgname=libva
pkgver=1.0.15
pkgrel=5
pkgrel=6
pkgdesc="libva with patches to extend VA API with data needed for VDPAU and XvBA backends."
arch=('i686' 'x86_64')
url="http://freedesktop.org/wiki/Software/vaapi"

View File

@ -4,15 +4,15 @@
# Maintainer: Fabian Kosmale <0inkane@googlemail.com>
pkgname=openjpeg
pkgver=1.5.0
pkgrel=2
pkgver=1.5.1
pkgrel=1
pkgdesc="An open source JPEG 2000 codec"
arch=('x86_64')
license=('BSD')
url="http://www.openjpeg.org"
depends=('zlib')
source=("http://openjpeg.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
md5sums=("e5d66193ddfa59a87da1eb08ea86293b")
md5sums=('b5f74cec2688fb918331bb014061be6f')
options=('!libtool')

View File

@ -5,7 +5,7 @@
pkgname=x264
pkgver=20121206
pkgrel=1
pkgrel=2
pkgdesc="free library for encoding H264/AVC video streams"
arch=('x86_64')
url="http://www.videolan.org/developers/x264.html"