From bec4be64a1bb15ff6fb6f9902f275324ccc16306 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 5 Jun 2013 20:05:47 +0900 Subject: [PATCH] efl: actually test and make pkgbuild work. --- doc/images.mk | 2 +- pkgbuild/PKGBUILD.in | 61 +++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/doc/images.mk b/doc/images.mk index a34a36519b..1659a0909a 100644 --- a/doc/images.mk +++ b/doc/images.mk @@ -1 +1 @@ -EXTRA_DIST += img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/br.png img/button_background.png img/button_hover_background.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/clipping.eps img/clipping.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/diagram_ephysics.eps img/diagram_ephysics.png img/ecore_con-client-server.eps img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_thread.eps img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/ecore_thread.png img/edje-animations2.eps img/edje-animations2.png img/edje-animations.eps img/edje-animations.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/edoxy.css img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_list.eps img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-free.eps img/eina-list-free.png img/eina_list.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina_stringshare.eps img/eina_stringshare.png img/emotion_ratio.eps img/emotion_ratio.png img/e.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/foot_bg.png img/footer_background.png img/forces.eps img/forces.png img/growing_balls.eps img/growing_balls.png img/head_bg.png img/header_background.png img/header_menu_background_last.png img/header_menu_background.png img/header_menu_current_background.png img/header_menu_hover_background_left.png img/header_menu_hover_background.png img/header_menu_unselected_background.png img/header_menu_unselected_next_background.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/logo.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-light.eps img/map-light.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/menu_bg_current.png img/menu_bg_hover.png img/menu_bg_last.png img/menu_bg.png img/menu_bg_unsel.png img/no_gravity.eps img/no_gravity.png img/padding-hints.eps img/padding-hints.png img/pn-1.png img/pn-2.png img/pn-3.png img/pn-4.png img/pn-6.png img/pn-7.png img/pn-8.png img/pn-9.png img/prog_flow.eps img/prog_flow.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/swallow2final.eps img/swallow2final.png img/text-styles.eps img/text-styles.png +EXTRA_DIST += img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/b1.png img/b2.png img/b3.png img/b4.png img/b5.png img/b6.png img/b7.png img/b8.png img/b9.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/br.png img/button_background.png img/button_hover_background.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/clipping.eps img/clipping.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/diagram_ephysics.eps img/diagram_ephysics.png img/e.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server.eps img/ecore_con-client-server.png img/ecore_thread.eps img/ecore_thread.png img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/edje-animations.eps img/edje-animations.png img/edje-animations2.eps img/edje-animations2.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/edoxy.css img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-free.eps img/eina-list-free.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_list.eps img/eina_list.png img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina_stringshare.eps img/eina_stringshare.png img/emotion_ratio.eps img/emotion_ratio.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/foot_bg.png img/footer_background.png img/forces.eps img/forces.png img/growing_balls.eps img/growing_balls.png img/head_bg.png img/header_background.png img/header_menu_background.png img/header_menu_background_last.png img/header_menu_current_background.png img/header_menu_hover_background.png img/header_menu_hover_background_left.png img/header_menu_unselected_background.png img/header_menu_unselected_next_background.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/logo.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light.eps img/map-light.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/menu_bg.png img/menu_bg_current.png img/menu_bg_hover.png img/menu_bg_last.png img/menu_bg_unsel.png img/no_gravity.eps img/no_gravity.png img/padding-hints.eps img/padding-hints.png img/pn-1.png img/pn-2.png img/pn-3.png img/pn-4.png img/pn-6.png img/pn-7.png img/pn-8.png img/pn-9.png img/prog_flow.eps img/prog_flow.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/swallow2final.eps img/swallow2final.png img/text-styles.eps img/text-styles.png diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD.in index 55b16f0f82..50a02dc924 100644 --- a/pkgbuild/PKGBUILD.in +++ b/pkgbuild/PKGBUILD.in @@ -2,32 +2,50 @@ pkgname=('efl' 'efl_doc' 'efl_x11') pkgver=@VERSION@ pkgrel=1 -pkgdesc="Enlightenment Foundation Libraries" +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' 'GPL2') -depends=('bullet' 'libpng' 'libjpeg-turbo' 'gstreamer0.10' 'zlib' 'lua' 'libtiff' 'openssl' 'util-linux' 'curl' 'dbus-core' 'glibc' 'fontconfig' 'freetype2' 'fribidi' 'libpulse' 'libsndfile' 'systemd' 'libx11' 'libxau' 'libxcomposite' 'libxdamage' 'libxdmcp' 'libxext' 'libxfixes' 'libxinerama' 'libxi' 'libxrandr' 'libxrender' 'libxss' 'libxtst' ' libgl' 'giflib') -provides=() -replaces=() -options=('strip' 'docs' 'zipman') +makedepends=('doxygen') +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-core' + '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') +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=$pkgver" 'efl_x11' 'efl-svn') +conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' + 'emotion' 'ethumb' 'evas' 'efl' 'efl_x11' 'efl-svn') +options=('strip' 'docs' 'zipman' '!libtool' 'debug') buildflags="-fvisibility=hidden -fomit-frame-pointer" build() { - cd ".." + cd "../.." + make clean distclean ./configure --prefix=/usr \ - --disable-static --enable-fb --disable-tslib --enable-xinput22 + --disable-static --disable-tslib --enable-fb \ + --enable-xinput22 --enable-multisense --enable-systemd \ + --enable-image-loader-webp --enable-harfbuzz make - make doc } -check() { - cd ".." - make -k check -} +#check() { +# cd "../.." +# make -k check +#} package_efl() { - cd ".." + export CFLAGS="-O2 -g -pipe -fvisibility=hidden -ffast-math" + export LDFLAGS="" + cd "../.." rm -rf $pkgdir/usr - make DESTDIR="$pkgdir/" install + make -j1 DESTDIR="$pkgdir/" install install -Dm644 README $pkgdir/usr/share/$pkgname/licenses/$pkgname/README install -Dm644 NEWS $pkgdir/usr/share/$pkgname/licenses/$pkgname/NEWS install -Dm644 ChangeLog $pkgdir/usr/share/$pkgname/licenses/$pkgname/ChangeLog @@ -48,19 +66,21 @@ package_efl() { } package_efl_doc() { - cd ".." + cd "../.." rm -rf $pkgdir/usr - make DESTDIR="$pkgdir/" install + make -j1 doc + make -j1 DESTDIR="$pkgdir/" install mkdir -p $pkgdir/usr/share/man/man3 cp -r doc/html $pkgdir/usr/share/$pkgname/ cp -r doc/latex $pkgdir/usr/share/$pkgname/latex + rm -f `find $pkgdir -name '*.la' -print` } package_efl_x11() { - cd ".." + cd "../.." rm -rf $pkgdir/usr - make DESTDIR="$pkgdir/" install - tar cf xf.tar \ + make -j1 DESTDIR="$pkgdir/" install + tar cf /tmp/xf.tar \ $pkgdir/usr/include/evas-1/Evas_Engine_*_X11.h \ $pkgdir/usr/include/ecore-x-1 \ $pkgdir/usr/lib/evas/modules/engines/*_x11 \ @@ -69,5 +89,6 @@ package_efl_x11() { $pkgdir/usr/lib/pkgconfig/ecore-x.pc \ $pkgdir/usr/lib/pkgconfig/evas-*-x11.pc rm -rf $pkgdir/usr - tar -C / -P -xf xf.tar + tar -C / -P -xf /tmp/xf.tar + rm -f `find $pkgdir -name '*.la' -print` }