summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@samsung.com>2013-12-12 11:04:43 +0900
committerCedric BAIL <cedric.bail@samsung.com>2013-12-12 11:05:13 +0900
commit87be907144aaa5023b00e6f788d64e7ca3f1ff17 (patch)
tree24f47ac7c2368ed788f5b7fb20c1ab406fcd9f6d
parent3d132d722f057d7eeb2363cba6c95184327f0559 (diff)
pkgbuild: follow aur efl-git version naming.
-rw-r--r--configure.ac1
-rw-r--r--pkgbuild/.gitignore1
-rw-r--r--pkgbuild/PKGBUILD (renamed from pkgbuild/PKGBUILD.in)24
3 files changed, 18 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index c03a33105..29c67aeb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3758,7 +3758,6 @@ src/lib/eina/eina_config.h
src/lib/ecore_x/ecore_x_version.h
src/lib/efl/Efl_Config.h
spec/efl.spec
-pkgbuild/PKGBUILD
pc/evil.pc
pc/escape.pc
pc/eina.pc
diff --git a/pkgbuild/.gitignore b/pkgbuild/.gitignore
index 913d3ff89..39ef43471 100644
--- a/pkgbuild/.gitignore
+++ b/pkgbuild/.gitignore
@@ -1,4 +1,3 @@
-/PKGBUILD
/pkg
/src
/*.tar.xz
diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD
index 6bb72af49..6f383f20f 100644
--- a/pkgbuild/PKGBUILD.in
+++ b/pkgbuild/PKGBUILD
@@ -1,6 +1,7 @@
# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
-pkgname=('efl' 'efl_doc')
-pkgver=@VERSION@
+pkgname=('efl-git' 'efl_doc-git')
+_pkgname=${pkgname%-*}
+pkgver=1.8.99.23938.7299d55
pkgrel=1
pkgdesc="Enlightenment Foundation Libraries - GIT development snapshot (Ecore, Eldbus, Edje, Eet, Eeze, Efreet, Eina, Eio, Embryo, Emotion, Eo, Ephysics, Ethumb, & Evas)"
arch=('i686' 'x86_64' 'arm')
@@ -17,15 +18,26 @@ depends=('bullet' 'libpng' 'libjpeg-turbo' 'gstreamer0.10'
'libxi' 'libxrandr' 'libxrender' 'libxss' 'libxtst'
'libxcursor' 'libxp' 'libgl' 'giflib' 'libwebp' 'harfbuzz'
'wayland' 'sdl')
+[[ ! $(pacman -T "openjpeg") ]] && depends+=('openjpeg') #jpeg2k loader is autodetected at build time
+makedepends=('git')
provides=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver"
"eet=$pkgver" "eeze=$pkgver" "efreet=$pkgver"
"eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver"
- "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver" "efl-git")
+ "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver" "$_pkgname=$pkgver")
conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
- 'ethumb' 'evas' 'efl-git')
+ 'ethumb' 'evas' "$_pkgname")
options=('!libtool' 'debug')
install=efl.install
+pkgver() {
+ cd "../.."
+
+ local efl_version=$(grep -m 1 EFL_VERSION configure.ac | grep -o "[[:digit:]]*" | tr '\n' '.')
+ efl_version=$(awk -F , -v efl_version=${efl_version%.} '/^AC_INIT/ {gsub(/efl_version/, efl_version); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
+
+ printf "$efl_version.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+}
+
prepare() {
sed -i 's/env python$/&2/' "../../src/scripts/eina/eina-bench-cmp"
}
@@ -49,7 +61,7 @@ build() {
# make -k check
#}
-package_efl() {
+package_efl-git() {
cd "../.."
make -j1 DESTDIR="$pkgdir/" install
install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
@@ -67,7 +79,7 @@ package_efl() {
ln -s "../licenses/$pkgname/COPYING.SMALL" "$pkgdir/usr/share/$pkgname/COPYING.SMALL"
}
-package_efl_doc() {
+package_efl_doc-git() {
pkgdesc="Documentation for the Enlightenment Foundation Libraries"
arch=('any')
unset license depends provides conflicts install