[arch-commits] Commit in libtheora/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Jan de Groot]

    Date: Saturday, November 8, 2008 @ 17:33:33
  Author: jgc
Revision: 18741

Fix conflict

Modified:
  libtheora/repos/extra-x86_64/	(properties)
  libtheora/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)


Property changes on: libtheora/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libtheora/trunk:1
   + /libtheora/trunk:1-18738

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-08 22:33:05 UTC (rev 18740)
+++ extra-x86_64/PKGBUILD	2008-11-08 22:33:33 UTC (rev 18741)
@@ -3,25 +3,24 @@
 # Committer: dorphell <dorphell at archlinux.org>
 
 pkgname=libtheora
-pkgver=1.0beta1
+pkgver=1.0
 pkgrel=1
 pkgdesc="An open video codec developed by the Xiph.org"
 arch=('i686' 'x86_64')
 depends=('libogg')
 makedepends=('libvorbis')
-url="http://www.xiph.org"
+url=http://www.xiph.org
 license=('custom')
-options=('!libtool')
+options=(!libtool)
 source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2)
-md5sums=('e2ff1996c5a9fadd0df1025aa10bc35e')
+md5sums=('c963937053f45a7878954bed37ceb182')
 
 build() {
-  cd ${startdir}/src/libtheora-${pkgver}
-  ./configure --prefix=/usr --enable-shared
+  cd "${srcdir}/libtheora-${pkgver}"
+  ./configure --prefix=/usr --enable-shared --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
   
-  for file in LICENSE COPYING ; do
-    install -D $file $startdir/pkg/usr/share/licenses/libtheora/$file
-  done
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }