pkgbuild: follow aur efl-git version naming.

diff --git a/configure.ac b/configure.ac
index c03a33105d1c669f46b4a1d9aee281baf8a95d96..29c67aeb561910a316f8873cd098a84c5f5c54a2 100644 (file)
--- 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 913d3ff89232e1d32c365f18704a1eb339c22485..39ef4347112a56f71d60fade53a64e210b475418 100644 (file)
--- a/pkgbuild/.gitignore
+++ b/pkgbuild/.gitignore
@@ -1,4 +1,3 @@
-/PKGBUILD
 /pkg
 /src
 /*.tar.xz

diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD
new file mode 100644 (file)
index 0000000..6f383f2
--- /dev/null
+++ b/pkgbuild/PKGBUILD
@@ -0,0 +1,91 @@
+# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
+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')
+url="http://www.enlightenment.org"
+license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
+makedepends=('doxygen' 'check')
+depends=('bullet' 'libpng' 'libjpeg-turbo' 'gstreamer0.10'
+         'gstreamer0.10-base' 'gstreamer0.10-good'
+         'gstreamer0.10-bad' 'gstreamer0.10-ugly' 'gstreamer0.10-ffmpeg'
+         'zlib' 'lua' 'libtiff' 'openssl' 'util-linux' 'curl' 'dbus'
+         'glibc' 'fontconfig' 'freetype2' 'fribidi' 'libpulse'
+         'libsndfile' 'systemd' 'libx11' 'libxau' 'libxcomposite'
+         'libxdamage' 'libxdmcp' 'libxext' 'libxfixes' 'libxinerama'
+         '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" "$_pkgname=$pkgver")
+conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
+           '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"
+}
+
+build() {
+  cd "../.."
+  export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
+  export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fomit-frame-pointer"
+  [[ -e Makefile ]] && make clean distclean
+  ./configure --prefix=/usr \
+  --disable-static --disable-tslib --enable-fb \
+  --enable-xinput22 --enable-multisense --enable-systemd \
+  --enable-image-loader-webp --enable-harfbuzz \
+  --enable-wayland --enable-drm --enable-sdl
+  make
+  make -j1 doc
+}
+
+#check() {
+#  cd "../.."
+#  make -k check
+#}
+
+package_efl-git() {
+  cd "../.."
+  make -j1 DESTDIR="$pkgdir/" install
+  install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
+  install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS"
+  install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog"
+  install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS"
+  install -Dm644 COMPLIANCE "$pkgdir/usr/share/$pkgname/COMPLIANCE"
+  install -Dm644 licenses/COPYING.BSD "$pkgdir/usr/share/licenses/$pkgname/COPYING.BSD"
+  install -Dm644 licenses/COPYING.GPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.GPL"
+  install -Dm644 licenses/COPYING.LGPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL"
+  install -Dm644 licenses/COPYING.SMALL "$pkgdir/usr/share/licenses/$pkgname/COPYING.SMALL"
+  ln -s "../licenses/$pkgname/COPYING.BSD" "$pkgdir/usr/share/$pkgname/COPYING.BSD"
+  ln -s "../licenses/$pkgname/COPYING.GPL" "$pkgdir/usr/share/$pkgname/COPYING.GPL"
+  ln -s "../licenses/$pkgname/COPYING.LGPL" "$pkgdir/usr/share/$pkgname/COPYING.LGPL"
+  ln -s "../licenses/$pkgname/COPYING.SMALL" "$pkgdir/usr/share/$pkgname/COPYING.SMALL"
+}
+
+package_efl_doc-git() {
+  pkgdesc="Documentation for the Enlightenment Foundation Libraries"
+  arch=('any')
+  unset license depends provides conflicts install
+  cd "../.."
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html"
+  cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex"
+}
+

diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD.in
deleted file mode 100644 (file)
index 6bb72af..0000000
--- a/pkgbuild/PKGBUILD.in
+++ /dev/null
@@ -1,79 +0,0 @@
-# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
-pkgname=('efl' 'efl_doc')
-pkgver=@VERSION@
-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')
-url="http://www.enlightenment.org"
-license=('BSD' 'LGPL2.1' 'GPL2' 'custom')
-makedepends=('doxygen' 'check')
-depends=('bullet' 'libpng' 'libjpeg-turbo' 'gstreamer0.10'
-         'gstreamer0.10-base' 'gstreamer0.10-good'
-         'gstreamer0.10-bad' 'gstreamer0.10-ugly' 'gstreamer0.10-ffmpeg'
-         'zlib' 'lua' 'libtiff' 'openssl' 'util-linux' 'curl' 'dbus'
-         'glibc' 'fontconfig' 'freetype2' 'fribidi' 'libpulse'
-         'libsndfile' 'systemd' 'libx11' 'libxau' 'libxcomposite'
-         'libxdamage' 'libxdmcp' 'libxext' 'libxfixes' 'libxinerama'
-         'libxi' 'libxrandr' 'libxrender' 'libxss' 'libxtst'
-         'libxcursor' 'libxp' 'libgl' 'giflib' 'libwebp' 'harfbuzz'
-        'wayland' 'sdl')
-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")
-conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
-           'ethumb' 'evas' 'efl-git')
-options=('!libtool' 'debug')
-install=efl.install
-
-prepare() {
-  sed -i 's/env python$/&2/' "../../src/scripts/eina/eina-bench-cmp"
-}
-
-build() {
-  cd "../.."
-  export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
-  export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fomit-frame-pointer"
-  [[ -e Makefile ]] && make clean distclean
-  ./configure --prefix=/usr \
-  --disable-static --disable-tslib --enable-fb \
-  --enable-xinput22 --enable-multisense --enable-systemd \
-  --enable-image-loader-webp --enable-harfbuzz \
-  --enable-wayland --enable-drm --enable-sdl
-  make
-  make -j1 doc
-}
-
-#check() {
-#  cd "../.."
-#  make -k check
-#}
-
-package_efl() {
-  cd "../.."
-  make -j1 DESTDIR="$pkgdir/" install
-  install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
-  install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS"
-  install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog"
-  install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS"
-  install -Dm644 COMPLIANCE "$pkgdir/usr/share/$pkgname/COMPLIANCE"
-  install -Dm644 licenses/COPYING.BSD "$pkgdir/usr/share/licenses/$pkgname/COPYING.BSD"
-  install -Dm644 licenses/COPYING.GPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.GPL"
-  install -Dm644 licenses/COPYING.LGPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL"
-  install -Dm644 licenses/COPYING.SMALL "$pkgdir/usr/share/licenses/$pkgname/COPYING.SMALL"
-  ln -s "../licenses/$pkgname/COPYING.BSD" "$pkgdir/usr/share/$pkgname/COPYING.BSD"
-  ln -s "../licenses/$pkgname/COPYING.GPL" "$pkgdir/usr/share/$pkgname/COPYING.GPL"
-  ln -s "../licenses/$pkgname/COPYING.LGPL" "$pkgdir/usr/share/$pkgname/COPYING.LGPL"
-  ln -s "../licenses/$pkgname/COPYING.SMALL" "$pkgdir/usr/share/$pkgname/COPYING.SMALL"
-}
-
-package_efl_doc() {
-  pkgdesc="Documentation for the Enlightenment Foundation Libraries"
-  arch=('any')
-  unset license depends provides conflicts install
-  cd "../.."
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-  cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html"
-  cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex"
-}
-