wok-6.x rev 9847

Up: libgphoto2 to 2.4.11.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun May 15 21:17:14 2011 +0000 (2011-05-15)
parents 6020e5c397e2
children 0fc993bb788f
files libgphoto2-dev/receipt libgphoto2/receipt
line diff
     1.1 --- a/libgphoto2-dev/receipt	Sun May 15 18:30:30 2011 +0000
     1.2 +++ b/libgphoto2-dev/receipt	Sun May 15 21:17:14 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="libgphoto2-dev"
     1.7 -VERSION="2.4.10.1"
     1.8 +VERSION="2.4.11"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="libgphoto2 devel files"
    1.11  MAINTAINER="jozee@slitaz.org"
     2.1 --- a/libgphoto2/receipt	Sun May 15 18:30:30 2011 +0000
     2.2 +++ b/libgphoto2/receipt	Sun May 15 21:17:14 2011 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libgphoto2"
     2.7 -VERSION="2.4.10.1"
     2.8 +VERSION="2.4.11"
     2.9  CATEGORY="graphics"
    2.10  SHORT_DESC="core library of gphoto2 to access photos from digital camera"
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12 @@ -12,15 +12,14 @@
    2.13  WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
    2.14  TAGS="camera photo"
    2.15  
    2.16 -
    2.17  # Rules to configure and make the package.
    2.18  compile_rules()
    2.19  {
    2.20     	cd $src
    2.21  	./configure --prefix=/usr udevscriptdir=/lib/udev \
    2.22  			--with-exif --disable-static &&
    2.23 -	make -j 4 &&
    2.24 -	make DESTDIR=$PWD/_pkg install
    2.25 +	make &&
    2.26 +	make install
    2.27  	
    2.28  }
    2.29  
    2.30 @@ -45,21 +44,6 @@
    2.31  	chmod +x $fs/lib/udev/check*
    2.32  	chmod +x $fs/usr/bin/gphoto2*
    2.33  	
    2.34 -	HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
    2.35 -	UDEV_RULE="etc/udev/rules.d/70-libgphoto2.rules"
    2.36 -	CAM_LIST="usr/lib/libgphoto2/print-camera-list"
    2.37 -
    2.38 -   # Let print-camera-list find libgphoto2.so
    2.39 -    export LD_LIBRARY_PATH="$fs/usr/lib"
    2.40 -   # Let libgphoto2 find its camera-modules before running print-camera-list
    2.41 -	export CAMLIBS="$fs/usr/lib/libgphoto2/$VERSION"
    2.42 -
    2.43 -  # HAL file
    2.44 -   "$fs/$CAM_LIST" hal-fdi > "$fs/$HAL_FDI" || return 1
    2.45 -  
    2.46 -    #udev rule
    2.47 -   "$fs/$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$fs/$UDEV_RULE" || return 1
    2.48 -
    2.49  }
    2.50  
    2.51  post_install()
    2.52 @@ -67,6 +51,21 @@
    2.53  	local root
    2.54  	root=$1
    2.55  	
    2.56 +	HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
    2.57 +	UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules"
    2.58 +	CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list"
    2.59 +
    2.60 +	# Let print-camera-list find libgphoto2.so
    2.61 +	export LD_LIBRARY_PATH="$1/usr/lib"
    2.62 +	# Let libgphoto2 find its camera-modules before running print-camera-list
    2.63 +	export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION"
    2.64 +
    2.65 +	# HAL file
    2.66 +	"$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1
    2.67 +  
    2.68 +	#udev rule
    2.69 +	"$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1
    2.70 +	
    2.71  	tazpkg reconfigure udev --root=$1
    2.72  	
    2.73  	# add group camera
    2.74 @@ -79,5 +78,5 @@
    2.75  
    2.76  post_remove()
    2.77  {
    2.78 -	delgroup camera & >/dev/null
    2.79 +	chroot "$1/" delgroup camera & >/dev/null
    2.80  }