summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD61
2 files changed, 39 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ebe3e87250f1..bb45fe55dc65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = efl-svn
- pkgdesc = Enlightenment Foundation Libraries - Ecore, EDBus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas
- pkgver = 83565
+pkgbase = efl-git
+ pkgdesc = Enlightenment Foundation Libraries - Development version (Ecore, EDBus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas)
+ pkgver = 20130215
pkgrel = 1
url = http://www.enlightenment.org
install = efl.install
@@ -10,7 +10,7 @@ pkgbase = efl-svn
license = LGPL2.1
license = GPL2
license = custom
- makedepends = subversion
+ makedepends = git
depends = bullet
depends = curl
depends = dbus
@@ -34,7 +34,7 @@ pkgbase = efl-svn
depends = libxp
depends = gstreamer0.10-base-plugins
optdepends = python2: compare Eina benchmarks
- optdepends = evas_generic_loaders-svn: More video/graphic/icon loaders for Evas
+ optdepends = evas_generic_loaders-git: More video/graphic/icon loaders for Evas
optdepends = gstreamer0.10-good-plugins: Access more types of video in Emotion
optdepends = gstreamer0.10-bad-plugins: Access more types of video in Emotion
optdepends = gstreamer0.10-ugly-plugins: Access more types of video in Emotion
@@ -65,6 +65,7 @@ pkgbase = efl-svn
provides = ethumb-svn
provides = evas
provides = evas-svn
+ provides = efl-svn
conflicts = ecore
conflicts = ecore-svn
conflicts = edbus
@@ -91,9 +92,10 @@ pkgbase = efl-svn
conflicts = ethumb-svn
conflicts = evas
conflicts = evas-svn
+ conflicts = efl-svn
options = !libtool
options = !emptydirs
options = !strip
-pkgname = efl-svn
+pkgname = efl-git
diff --git a/PKGBUILD b/PKGBUILD
index 3b80a1deee26..c781120f1806 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
-pkgname=efl-svn
-pkgver=83565
+pkgname=efl-git
+pkgver=20130215
pkgrel=1
-pkgdesc="Enlightenment Foundation Libraries - Ecore, EDBus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas"
+pkgdesc="Enlightenment Foundation Libraries - Development version (Ecore, EDBus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas)"
arch=('i686' 'x86_64')
url="http://www.enlightenment.org"
license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
@@ -12,9 +13,9 @@ depends=('bullet' 'curl' 'dbus' 'udev' 'lua' 'shared-mime-info'
'mesa' 'giflib' 'libtiff' 'libpng' 'libpulse' 'libexif'
'libxcomposite' 'libxcursor' 'libxinerama' 'libxss' 'libxrandr' 'libxp'
'gstreamer0.10-base-plugins')
-makedepends=('subversion')
+makedepends=('git')
optdepends=('python2: compare Eina benchmarks'
- 'evas_generic_loaders-svn: More video/graphic/icon loaders for Evas'
+ 'evas_generic_loaders-git: More video/graphic/icon loaders for Evas'
'gstreamer0.10-good-plugins: Access more types of video in Emotion'
'gstreamer0.10-bad-plugins: Access more types of video in Emotion'
'gstreamer0.10-ugly-plugins: Access more types of video in Emotion'
@@ -23,38 +24,39 @@ conflicts=('ecore' 'ecore-svn' 'edbus' 'edbus-svn' 'edje' 'edje-svn'
'eet' 'eet-svn' 'eeze' 'eeze-svn' 'efreet' 'efreet-svn'
'eina' 'eina-svn' 'eio' 'eio-svn' 'embryo' 'embryo-svn'
'emotion' 'emotion-svn' 'ephysics' 'ephysics-svn'
- 'ethumb' 'ethumb-svn' 'evas' 'evas-svn')
+ 'ethumb' 'ethumb-svn' 'evas' 'evas-svn' 'efl-svn')
provides=('ecore' 'ecore-svn' 'edbus' 'edbus-svn' 'edje' 'edje-svn'
'eet' 'eet-svn' 'eeze' 'eeze-svn' 'efreet' 'efreet-svn'
'eina' 'eina-svn' 'eio' 'eio-svn' 'embryo' 'embryo-svn'
'emotion' 'emotion-svn' 'ephysics' 'ephysics-svn'
- 'ethumb' 'ethumb-svn' 'evas' 'evas-svn')
+ 'ethumb' 'ethumb-svn' 'evas' 'evas-svn' 'efl-svn')
install=efl.install
options=('!libtool' '!emptydirs' '!strip')
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/efl"
-_svnmod="efl"
+_gitroot="git://git.enlightenment.org/core/efl.git"
+_gitname="efl"
build() {
cd "$srcdir"
+ msg "Connecting to GIT server...."
- msg "Connecting to SVN server...."
-
- if [[ -d "$_svnmod/.svn" ]]; then
- (cd "$_svnmod" && svn up -r "$pkgver")
+ if [[ -d "$_gitname" ]]; then
+ cd "$_gitname" && git pull origin
+ msg "The local files are updated."
else
- svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
+ git clone "$_gitroot" "$_gitname"
fi
- msg "SVN checkout done or server timeout"
+ msg "GIT checkout done or server timeout"
msg "Starting build..."
- rm -rf "$srcdir/$_svnmod-build"
- svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
- cd "$srcdir/$_svnmod-build"
+ rm -rf "$srcdir/$_gitname-build"
+ git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname-build"
- sed -i 's:#!/usr/bin/env python:#!/usr/bin/python2:g' \
- "$srcdir/$_svnmod-build/src/scripts/eina/eina-bench-cmp"
+# set python scripts to run with python2
+ sed -i 's/env python/python2/g' \
+ "$srcdir/$_gitname-build/src/scripts/eina/eina-bench-cmp"
./autogen.sh --prefix=/usr \
--with-x11=xlib \
@@ -68,18 +70,17 @@ build() {
}
package() {
- cd "$srcdir/$_svnmod-build"
+ cd "$srcdir/$_gitname-build"
make -j1 DESTDIR="$pkgdir" install
# install license files
- install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- install -Dm644 "$srcdir/$_svnmod-build/AUTHORS" \
- "$pkgdir/usr/share/licenses/$pkgname/AUTHORS"
- install -Dm644 "$srcdir/$_svnmod-build/licenses/COPYING.BSD" \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING.BSD"
- install -Dm644 "$srcdir/$_svnmod-build/licenses/COPYING.SMALL" \
- "$pkgdir/usr/share/licenses/$pkgname/COPYING.SMALL"
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ install -Dm644 AUTHORS "$pkgdir/usr/share/licenses/$pkgname/AUTHORS"
+ install -Dm644 licenses/COPYING.BSD \
+ "$pkgdir/usr/share/licenses/$pkgname/COPYING.BSD"
+ install -Dm644 licenses/COPYING.SMALL \
+ "$pkgdir/usr/share/licenses/$pkgname/COPYING.SMALL"
- rm -r "$srcdir/$_svnmod-build"
+# remove build directory
+ rm -r "$srcdir/$_gitname-build"
}