# HG changeset patch # User Christopher Rogers # Date 1305494234 0 # Node ID 1c07269ece96b1912432e3e35cae9a9d7ab64b53 # Parent 6020e5c397e216476bf7b3c045303c61e4d4ca03 Up: libgphoto2 to 2.4.11. diff -r 6020e5c397e2 -r 1c07269ece96 libgphoto2-dev/receipt --- a/libgphoto2-dev/receipt Sun May 15 18:30:30 2011 +0000 +++ b/libgphoto2-dev/receipt Sun May 15 21:17:14 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgphoto2-dev" -VERSION="2.4.10.1" +VERSION="2.4.11" CATEGORY="development" SHORT_DESC="libgphoto2 devel files" MAINTAINER="jozee@slitaz.org" diff -r 6020e5c397e2 -r 1c07269ece96 libgphoto2/receipt --- a/libgphoto2/receipt Sun May 15 18:30:30 2011 +0000 +++ b/libgphoto2/receipt Sun May 15 21:17:14 2011 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgphoto2" -VERSION="2.4.10.1" +VERSION="2.4.11" CATEGORY="graphics" SHORT_DESC="core library of gphoto2 to access photos from digital camera" MAINTAINER="jozee@slitaz.org" @@ -12,15 +12,14 @@ WGET_URL="$SF_MIRROR/gphoto/$TARBALL" TAGS="camera photo" - # Rules to configure and make the package. compile_rules() { cd $src ./configure --prefix=/usr udevscriptdir=/lib/udev \ --with-exif --disable-static && - make -j 4 && - make DESTDIR=$PWD/_pkg install + make && + make install } @@ -45,21 +44,6 @@ chmod +x $fs/lib/udev/check* chmod +x $fs/usr/bin/gphoto2* - HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" - UDEV_RULE="etc/udev/rules.d/70-libgphoto2.rules" - CAM_LIST="usr/lib/libgphoto2/print-camera-list" - - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="$fs/usr/lib" - # Let libgphoto2 find its camera-modules before running print-camera-list - export CAMLIBS="$fs/usr/lib/libgphoto2/$VERSION" - - # HAL file - "$fs/$CAM_LIST" hal-fdi > "$fs/$HAL_FDI" || return 1 - - #udev rule - "$fs/$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$fs/$UDEV_RULE" || return 1 - } post_install() @@ -67,6 +51,21 @@ local root root=$1 + HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" + UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules" + CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list" + + # Let print-camera-list find libgphoto2.so + export LD_LIBRARY_PATH="$1/usr/lib" + # Let libgphoto2 find its camera-modules before running print-camera-list + export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION" + + # HAL file + "$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1 + + #udev rule + "$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1 + tazpkg reconfigure udev --root=$1 # add group camera @@ -79,5 +78,5 @@ post_remove() { - delgroup camera & >/dev/null + chroot "$1/" delgroup camera & >/dev/null }