wok-6.x diff libgphoto2/receipt @ 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 ebc1950c971b
children 7049937aebb0
line diff
     1.1 --- a/libgphoto2/receipt	Tue Nov 16 03:59:31 2010 +0000
     1.2 +++ b/libgphoto2/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"
     1.7 -VERSION="2.4.10.1"
     1.8 +VERSION="2.4.11"
     1.9  CATEGORY="graphics"
    1.10  SHORT_DESC="core library of gphoto2 to access photos from digital camera"
    1.11  MAINTAINER="jozee@slitaz.org"
    1.12 @@ -12,15 +12,14 @@
    1.13  WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
    1.14  TAGS="camera photo"
    1.15  
    1.16 -
    1.17  # Rules to configure and make the package.
    1.18  compile_rules()
    1.19  {
    1.20     	cd $src
    1.21  	./configure --prefix=/usr udevscriptdir=/lib/udev \
    1.22  			--with-exif --disable-static &&
    1.23 -	make -j 4 &&
    1.24 -	make DESTDIR=$PWD/_pkg install
    1.25 +	make &&
    1.26 +	make install
    1.27  	
    1.28  }
    1.29  
    1.30 @@ -45,21 +44,6 @@
    1.31  	chmod +x $fs/lib/udev/check*
    1.32  	chmod +x $fs/usr/bin/gphoto2*
    1.33  	
    1.34 -	HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
    1.35 -	UDEV_RULE="etc/udev/rules.d/70-libgphoto2.rules"
    1.36 -	CAM_LIST="usr/lib/libgphoto2/print-camera-list"
    1.37 -
    1.38 -   # Let print-camera-list find libgphoto2.so
    1.39 -    export LD_LIBRARY_PATH="$fs/usr/lib"
    1.40 -   # Let libgphoto2 find its camera-modules before running print-camera-list
    1.41 -	export CAMLIBS="$fs/usr/lib/libgphoto2/$VERSION"
    1.42 -
    1.43 -  # HAL file
    1.44 -   "$fs/$CAM_LIST" hal-fdi > "$fs/$HAL_FDI" || return 1
    1.45 -  
    1.46 -    #udev rule
    1.47 -   "$fs/$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$fs/$UDEV_RULE" || return 1
    1.48 -
    1.49  }
    1.50  
    1.51  post_install()
    1.52 @@ -67,6 +51,21 @@
    1.53  	local root
    1.54  	root=$1
    1.55  	
    1.56 +	HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
    1.57 +	UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules"
    1.58 +	CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list"
    1.59 +
    1.60 +	# Let print-camera-list find libgphoto2.so
    1.61 +	export LD_LIBRARY_PATH="$1/usr/lib"
    1.62 +	# Let libgphoto2 find its camera-modules before running print-camera-list
    1.63 +	export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION"
    1.64 +
    1.65 +	# HAL file
    1.66 +	"$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1
    1.67 +  
    1.68 +	#udev rule
    1.69 +	"$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1
    1.70 +	
    1.71  	tazpkg reconfigure udev --root=$1
    1.72  	
    1.73  	# add group camera
    1.74 @@ -79,5 +78,5 @@
    1.75  
    1.76  post_remove()
    1.77  {
    1.78 -	delgroup camera & >/dev/null
    1.79 +	chroot "$1/" delgroup camera & >/dev/null
    1.80  }