openjpeg stack, corrections & additions

ffmpeg/PKGBUILD

@@ -8,30 +8,28 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=ffmpeg
-pkgver=0.8.3
+pkgver=20110910
 pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix."
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
-license=('GPL3')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libva' 'openjpeg' 'libvpx' 'rtmpdump')
-makedepends=('yasm')
-options=('force')
-source=('http://www.ffmpeg.org/releases/ffmpeg-0.8.3.tar.bz2')
-md5sums=('7e9b8c8a6952de0c477027e48249f3ed')
+license=('GPL')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+makedepends=('yasm' 'git')
+#git clone git://git.videolan.org/ffmpeg.git
+source=(http://chakra-project.org/sources/ffmpeg/${pkgname}-${pkgver}.tar.xz)
+md5sums=('f726ae21f9c12551603d8a9cf301280a')
 
 build() {
-
-  cd $srcdir/$pkgbase-$pkgver
+  cd "$srcdir/$pkgname"
 
   ./configure \
     --prefix=/usr \
-    --enable-gpl \
-    --enable-version3 \
     --enable-libmp3lame \
     --enable-libvorbis \
     --enable-libxvid \
     --enable-libx264 \
+    --enable-libvpx \
     --enable-libtheora \
     --enable-postproc \
     --enable-shared \
@@ -40,21 +38,17 @@ build() {
     --enable-libopencore_amrwb \
     --enable-libschroedinger \
     --enable-libopenjpeg \
-    --enable-runtime-cpudetect \
-    --enable-libvpx \
     --enable-librtmp \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-runtime-cpudetect \
     --disable-debug
 
   make
   make tools/qt-faststart
   make doc/ff{mpeg,play,server}.1
+
+  make DESTDIR="$pkgdir" install install-man
+  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
 }
 
-package() {
-  cd $srcdir/$pkgbase-$pkgver
-
-  make DESTDIR="${pkgdir}" install install-man
-  install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:

frei0r-plugins/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=frei0r-plugins
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters."
 arch=(i686 x86_64)
 url="http://www.piksel.org/frei0r"

mlt/PKGBUILD

@@ -9,7 +9,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 # NOTE: Disabled the gtk2 module so no gtk-preview
 
-pkgname=mlt
+pkgbase=mlt
+pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.7.4
 pkgrel=1
 pkgdesc="An open source multimedia framework"

mplayer/PKGBUILD

@@ -22,7 +22,7 @@ url="http://www.mplayerhq.hu/"
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
-md5sums=('69545dd31e4235dd4212c4bf5ce14720'
+md5sums=('6973a2c9982f003829548a4c4d637b6b'
          'c0d6ef795cf6de48e3b87ff7c23f0319'
          'd00874ccc644b7f43d6ef1c942fcef28')
 

opencv/PKGBUILD

@@ -7,66 +7,109 @@
 # include global config
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
-pkgname=opencv
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.2.0
-pkgrel=4
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
-url="http://opencv.willowgarage.com"
+url="http://opencv.willowgarage.com/"
 depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'doxygen'
-             'python-numpy' 'eigen')
-optdepends=('eigen'
-            'python2-numpy')
+makedepends=('pkg-config' 'cmake' 'python-numpy' 'eigen')
+optdepends=('python-numpy: Python 2.x interface'
+            'eigen')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2
-        ptrcvcapture.patch)
-md5sums=('122c9ac793a46854ef2819fedbbd6b1b'
-         '461a8b1b0f2264521e13d9ae051d13be')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
+
+_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON'
+            '-D BUILD_TESTS=OFF'
+            '-D ENABLE_SSE=ON'
+            '-D ENABLE_SSE2=ON'
+            '-D ENABLE_SSE3=OFF'
+            '-D ENABLE_SSSE3=OFF'
+            '-D ENABLE_SSE41=OFF'
+            '-D ENABLE_SSE42=OFF'
+            '-D BUILD_EXAMPLES=ON'
+            '-D INSTALL_C_EXAMPLES=ON'
+            '-D INSTALL_PYTHON_EXAMPLES=ON'
+            '-D WITH_XINE=ON'
+            '-D WITH_QT=OFF'
+            '-D WITH_QT_OPENGL=OFF'
+            '-D WITH_UNICAP=OFF'
+            '-D WITH_PVAPI=OFF'
+            '-D WITH_OPENNI=OFF'
+            '-D WITH_TBB=OFF'
+            '-D WITH_IPP=OFF'
+            '-D WITH_CUDA=OFF'
+            '-D USE_FAST_MATH=ON'
+            '-D WITH_GTK=OFF')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
 
-  # Please do not remove any patches from trunk #
+  # x64, i.e "Athlon64" and upwards, can use SSE3
+  [ $CARCH = x86_64 ] && \
+    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
 
-  # libpng 1.4 compatibility
-  #patch -Np1 -i "$srcdir/libpng-1.4.patch"
+  cmake ${_cmakeopts[@]} .
 
-  # fix v4l issue
-  #patch -Np0 -i "$srcdir/v4l-mmap.patch"
-
-  # fix ffmpeg-related C++ issue
-  # see http://code.google.com/p/ffmpegsource/source/detail?r=311
-  #export CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-
-  # fix linking against highgui
-  # see https://bugs.archlinux.org/task/22841
-  patch -Np0 -i "$srcdir/ptrcvcapture.patch"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_SKIP_RPATH=ON \
-          -DWITH_XINE=ON \
-          -DWITH_UNICAP=OFF \
-          -DWITH_GTK=OFF \
-          -DBUILD_EXAMPLES=ON \
-          -DBUILD_TESTS=OFF \
-          -DINSTALL_C_EXAMPLES=ON \
-          -DINSTALL_PYTHON_EXAMPLES=ON
   make
 }
 
-package() {
+package_opencv() {
+  install=$pkgname.install
+
   cd "$srcdir/$_realname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  cd "$pkgdir/usr/share"
+
+  # prepare FSH-friendly dirs
+  if [ -d OpenCV ]; then
+    mv opencv/samples OpenCV/
+    rm -r opencv
+    mv OpenCV opencv
+  fi
+
+  # separate docs package; also be -R friendly
+  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
+
+  # separate samples package
+  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
+}
+
+package_opencv-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+  optdepends=()
+  options=('docs')
+
+  cd "$srcdir"
+
+  mkdir -p "$pkgdir/usr/share/doc"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+}
+
+package_opencv-samples() {
+  pkgdesc+=" (samples)"
+  depends=()
+  optdepends=()
+  options=()
+
+  cd "$srcdir"
+
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
 }
 
-# vim:set ts=2 sw=2 et:

opencv/opencv.install

@@ -0,0 +1,9 @@
+post_install() {
+	echo "  Documentation and samples are in separate packages:"
+	echo "    * opencv-docs"
+	echo "    * opencv-samples"
+}
+
+post_upgrade() {
+	post_install
+}

phonon-backend/PKGBUILD

@@ -20,7 +20,7 @@ _gst=4.5.1
 _xine=4.4.4
 _vlc=0.4.0
 _mplayer=${pkgver}.$(date +%Y%m%d)
-pkgrel=2
+pkgrel=3
 pkgdesc='The multimedia API for Qt 4 and KDE 4'
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'