Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

ffmpeg/PKGBUILD

@@ -8,27 +8,42 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=ffmpeg
-pkgver=20110330
+pkgver=0.6.3
-_head=HEAD-da3534b
+pkgrel=1
-pkgrel=4
+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>=1.0.7' 'openjpeg' 'libvpx')
 makedepends=('yasm')
-#remake snapshot with: http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz
-source=(http://chakra-project.org/sources/ffmpeg/ffmpeg-${_head}.tar.gz)
 options=('force')
-#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-md5sums=('fcd523f02061aa03a3a81dd022bac640')
 
 build() {
-  cd "$srcdir/$pkgname-$_head"
+  cd "${srcdir}"
+
+  msg "Connecting to GIT server...."
+ 
+  if [ -d "${pkgname}" ] ; then
+    cd "${pkgname}" && git pull origin
+    msg "The local files are updated."
+  else
+    # Fetch the required tag from Git
+    git clone --no-checkout git://git.videolan.org/ffmpeg.git
+    cd "${pkgname}"
+    git checkout -q "${pkgname}-${pkgver}"
+  fi
+ 
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+ 
+  rm -rf "${srcdir}/${pkgname}-build"
+  git clone "${srcdir}/${pkgname}" "${srcdir}/${pkgname}-build"
+  cd "${srcdir}/${pkgname}-build"
 
   ./configure \
     --prefix=/usr \
     --enable-gpl \
+    --enable-version3 \
     --enable-libmp3lame \
     --enable-libvorbis \
     --enable-libxvid \
@@ -42,9 +57,9 @@ build() {
     --enable-libopencore_amrwb \
     --enable-libschroedinger \
     --enable-libopenjpeg \
-    --enable-version3 \
     --enable-runtime-cpudetect \
     --enable-libvpx \
+    --enable-libgsm \
     --disable-debug
 
   make
@@ -52,10 +67,11 @@ build() {
   make doc/ff{mpeg,play,server}.1
 }
 
-package(){
+package() {
-  cd "$srcdir/$pkgname-$_head"
+  cd "${srcdir}/${pkgname}-build"
-  make DESTDIR="$pkgdir" install install-man
+
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+  make DESTDIR="${pkgdir}" install install-man
+  install -D -m755 tools/qt-faststart "${pkgdir}/usr/bin/qt-faststart"
 }
 
 # vim:set ts=2 sw=2 et:

gnash/PKGBUILD

@@ -5,9 +5,9 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
  
 pkgname=gnash
-pkgver=0.8.8
+pkgver=0.8.9
 pkgrel=1
-pkgdesc="GNU flash player and kpath plugin for KDE4"
+pkgdesc="GNU Flash player and kpath plugin for KDE 4."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gnash/"
 license=('GPL')
@@ -15,30 +15,40 @@ depends=('agg' 'ffmpeg' 'libjpeg' 'libpng' 'giflib' 'zlib' 'curl' 'giflib' 'boos
          'speex' 'fontconfig' 'libva' 'libxinerama' 'gstreamer0.10-base' 'gstreamer0.10-ffmpeg')
 provides=('gnash' 'gnash-common')
 conflicts=('flashplugin' 'flashplugin-square')
-source=(http://ftp.gnu.org/pub/gnu/gnash/$pkgver/gnash-$pkgver.tar.gz)
+source=("http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('aec414ee3bebb8901054818fae735214')
+md5sums=('01d0420932eede07211e368d405aee9c')
 options=(!libtool !emptydirs)
 backup=(etc/gnashrc etc/gnashpluginrc)
-build () {
- cd $startdir/src/gnash-$pkgver
- ./autogen.sh
- sed -i "s/moc-qt4/moc/g; s/uic-qt4/uic/g" configure
- ./configure --enable-renderer=agg \
-	--enable-media=ffmpeg \
-	--enable-gui=kde4 \
-	--enable-gif \
-	--enable-jpeg \
-	--enable-png \
-	--enable-z \
-	--with-plugins-install=system \
-	--with-npapi-plugindir=/usr/lib/mozilla/plugins \
-	--prefix=/usr \
-	--sysconfdir=/etc
 
- sed -i "s:KDE4_APPSDATADIR =.*:KDE4_APPSDATADIR = /usr/share/apps:" ./plugin/klash4/Makefile
+build() {
- sed -i "s:KDE4_SERVICESDIR =.*:KDE4_SERVICESDIR = /usr/share/kde4/services:" ./plugin/klash4/Makefile
+	cd "${startdir}/src/${pkgname}-${pkgver}"
- sed -i "s:KDE4_PLUGINDIR =.*:KDE4_PLUGINDIR = /usr/lib/kde4:" ./plugin/klash4/Makefile
+
- make || return 1
+	./autogen.sh
- make DESTDIR="$pkgdir" install || return 1
+
- make DESTDIR="$pkgdir" install-plugins || return 1
+	sed -i "s/moc-qt4/moc/g; s/uic-qt4/uic/g" configure
-}
+
+	./configure \
+		--enable-renderer=agg \
+		--enable-media=ffmpeg \
+		--enable-gui=kde4 \
+    --enable-sound=sdl \
+    --enable-hwaccel=vaapi \
+		--with-plugins-install=system \
+		--with-npapi-plugindir=/usr/lib/mozilla/plugins \
+		--prefix=/usr \
+		--sysconfdir=/etc
+
+	sed -i "s:KDE4_APPSDATADIR =.*:KDE4_APPSDATADIR = /usr/share/apps:" ./plugin/klash4/Makefile
+	sed -i "s:KDE4_SERVICESDIR =.*:KDE4_SERVICESDIR = /usr/share/kde4/services:" ./plugin/klash4/Makefile
+	sed -i "s:KDE4_PLUGINDIR =.*:KDE4_PLUGINDIR = /usr/lib/kde4:" ./plugin/klash4/Makefile
+	make || return 1
+}
+
+package() {
+	cd "${startdir}/src/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install || return 1
+	make DESTDIR="${pkgdir}" install-plugins || return 1
+}
+
+# vim:set ts=2 sw=2 et:

qt-docs/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=qt-docs
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc='The Qt gui toolkit documentation'
 arch=('any')
 url='http://qt.nokia.com/'
@@ -14,7 +14,6 @@ license=('GPL3' 'LGPL')
 options=('docs')
 depends=('qt')
 replaces=('qt-doc')
-provides=("qt-doc=${pkgver}")
 conflicts=("qt-doc=${pkgver}")
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz")

qt/qt.install

@@ -11,7 +11,7 @@ post_install() {
 		echo "   This version of qt is no longer a split package:"
 		echo " "
 		echo "   qt-tools is integrated in qt"
-		echo "   qt-doc, qt-demos and qt-debug are seperate packages"
+		echo "   qt-doc, qt-demos and qt-examples are one new package"
                 echo "   Please install with sudo pacman -S qt-docs"
 		echo " "
 		echo " > IMPORTANT "