[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD)

Ray Rashif schiv at nymeria.archlinux.org
Wed Apr 17 21:56:53 UTC 2013


    Date: Wednesday, April 17, 2013 @ 23:56:52
  Author: schiv
Revision: 88444

upgpkg: cinelerra-cv 1:2.2-14

openexr/ilmbase rebuild
also updated PKGBUILD to new VCS scheme

Modified:
  cinelerra-cv/trunk/PKGBUILD

----------+
 PKGBUILD |   56 ++++++++++++++++++++++++--------------------------------
 1 file changed, 24 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-17 18:45:36 UTC (rev 88443)
+++ PKGBUILD	2013-04-17 21:56:52 UTC (rev 88444)
@@ -7,25 +7,24 @@
 pkgname=cinelerra-cv
 pkgver=2.2
 _gitrel=2.2.0
-pkgrel=13
+pkgrel=14
 epoch=1
 pkgdesc="Professional video editing and compositing environment"
 arch=('x86_64' 'i686')
 url="http://cinelerra.org/"
 license=('GPL')
-depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2'
+depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv'
          'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu'
-         'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase>=1.0.3')
+         'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0')
 makedepends=('git' 'nasm' 'mesa')
 options=('!libtool')
-source=('v4l1_removal.patch'
+source=("$pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel"
+        'v4l1_removal.patch'
         'ffmpeg_api.patch')
-md5sums=('bfa85e20809429d88eba4ab83e569612'
+md5sums=('SKIP'
+         'bfa85e20809429d88eba4ab83e569612'
          'b05ec2fb54e7d02f6167525417802111')
 
-_gituri="git://git.cinelerra.org/CinelerraCV.git"
-_gitdir="cinelerra"
-
 _confit() {
   ./configure --prefix=/usr \
               --with-buildinfo=git/recompile \
@@ -34,43 +33,36 @@
               --disable-esd $@
 }
 
-build() {
-  msg "Connecting to GIT server...."
+prepare() {
+  cd "$srcdir/$pkgname"
 
-  if [ -d $_gitdir ] ; then
-    cd $_gitdir && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gituri -b rel$_gitrel $_gitdir
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitdir-build"
-  cp -r "$srcdir/$_gitdir" "$srcdir/$_gitdir-build"
-  cd "$srcdir/$_gitdir-build"
-
-  # gcc 4.6 workaround
-  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
-  export CPPFLAGS="$CFLAGS"
-
-  # remove executable stack
-  export LDFLAGS+=" -Wl,-z,noexecstack"
-
   # v4l1 removal patch
   patch -Np1 -i "$srcdir/v4l1_removal.patch"
 
   # new ffmpeg api patch
   patch -Np1 -i "$srcdir/ffmpeg_api.patch"
 
+  # TODO: check if this is still needed (not sure what it does) --schiv
   sed -i -e '/Debian/d' admin/nasm
 
   # if you don't need OpenGL comment out the next line (and no glu/mesa dep)
+  # TODO: kind of forgot about the specifics of this one, recheck --schiv
   sed -i '/\/X11R6/s///' configure.in
+}
 
+build() {
+  cd "$srcdir/$pkgname"
+
+  # gcc 4.6 workaround
+  export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS"
+  export CPPFLAGS="$CFLAGS"
+
+  # remove executable stack
+  export LDFLAGS+=" -Wl,-z,noexecstack"
+
   ./autogen.sh
 
+  # TODO: check if this is still needed (forgot why at all) --schiv
   if [ "$CARCH" = 'x86_64' ]; then
     _confit --disable-mmx
   else
@@ -81,7 +73,7 @@
 }
 
 package() {
-  cd "$srcdir/$_gitdir-build"
+  cd "$srcdir/$pkgname"
 
   make DESTDIR="$pkgdir" install
 }




More information about the arch-commits mailing list