[arch-commits] Commit in libgphoto2/repos (3 files)

Sat Oct 31 21:49:22 UTC 2009

Date: Saturday, October 31, 2009 @ 17:49:21
  Author: jgc
Revision: 57556

Merged revisions 57555 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libgphoto2/trunk

........
  r57555 | jgc | 2009-10-31 22:49:00 +0100 (Sat, 31 Oct 2009) | 2 lines
  
  upgpkg: libgphoto2 2.4.7-1
      Update to 2.4.7, remove patch that is included upstream
........

Modified:
  libgphoto2/repos/extra-i686/	(properties)
  libgphoto2/repos/extra-i686/PKGBUILD
Deleted:
  libgphoto2/repos/extra-i686/libgphoto2.udev-136.patch

---------------------------+
 PKGBUILD                  |   10 +---
 libgphoto2.udev-136.patch |  106 --------------------------------------------
 2 files changed, 4 insertions(+), 112 deletions(-)


Property changes on: libgphoto2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /libgphoto2/trunk:1-55085
   + /libgphoto2/trunk:1-57555

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-10-31 21:49:00 UTC (rev 57555)
+++ extra-i686/PKGBUILD	2009-10-31 21:49:21 UTC (rev 57556)
@@ -3,8 +3,8 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.4.6
-pkgrel=3
+pkgver=2.4.7
+pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64)
 url="http://www.gphoto.org"
@@ -12,13 +12,11 @@
 depends=('libexif>=0.6.17' 'libjpeg>=7' 'libtool>=2.2.6a' 'libusb')
 install=libgphoto2.install
 options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz
-        libgphoto2.udev-136.patch)
-md5sums=('3ad331acbe7e6ff4601705d504bdff94' '24ed32c30477c95561fb9a146915791e')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
+md5sums=('8f3e69a7cb8e1f89fb99badd1306124d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libgphoto2.udev-136.patch" || return 1
   udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath || return 1
   LD_PRELOAD="" make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Deleted: extra-i686/libgphoto2.udev-136.patch
===================================================================
--- extra-i686/libgphoto2.udev-136.patch	2009-10-31 21:49:00 UTC (rev 57555)
+++ extra-i686/libgphoto2.udev-136.patch	2009-10-31 21:49:21 UTC (rev 57556)
@@ -1,106 +0,0 @@
---- libgphoto2-2.4.6/packaging/generic/print-camera-list.c	2009-03-23 08:56:56.000000000 +0100
-+++ /home/martin/ubuntu/tmp/libgphoto2-2.4.6/packaging/generic/print-camera-list.c	2009-06-04 18:12:33.000000000 +0200
-@@ -366,12 +366,14 @@
- 
- typedef enum {
- 		UDEV_PRE_0_98 = 0,
--		UDEV_0_98 = 1
-+		UDEV_0_98 = 1,
-+		UDEV_136 = 2
- } udev_version_t;
- 
- static const StringFlagItem udev_version_t_map[] = {
- 	{ "pre-0.98", UDEV_PRE_0_98 },
- 	{ "0.98", UDEV_0_98 },
-+	{ "136", UDEV_136 },
- 	{ NULL, 0 }
- };
- 
-@@ -399,13 +401,20 @@
- 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
- 		/* UDEV_0_98 */
- 		"SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
-+		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n",
-+		/* UDEV_136 */
-+		"SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_rules_end\"\n"
-+		"ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"
- 		"ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"
-+		"ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n\n"
- 	};
- 	static const char * const usbcam_strings[] = {
- 		/* UDEV_PRE_0_98 */
--		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ",
-+		"SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\"",
- 		/* UDEV_0_98 */
--		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ",
-+		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\"",
-+		/* UDEV_136 */
-+		"ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"proprietary\""
- 	};
- 	udev_persistent_data_t *pdata;
- 	pdata = calloc(1, sizeof(udev_persistent_data_t));
-@@ -444,7 +453,8 @@
- 	    && pdata->mode == NULL 
- 	    && pdata->group == NULL 
- 	    && pdata->owner == NULL 
--	    && pdata->script == NULL) {
-+	    && pdata->script == NULL
-+	    && pdata->version <= UDEV_0_98) {
- 		FATAL("Either <script> or <mode,group,owner> parameters must be given.");
- 	}
- 	if ((pdata->script != NULL) && (pdata->mode != NULL 
-@@ -547,7 +557,11 @@
- 
- 	if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) {
- 		if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) {
--			printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\", ", class, subclass, proto);
-+			if (pdata->version == UDEV_136) {
-+				printf("ENV{ID_USB_INTERFACES}==\"*:%02d%02d%02d:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\"", class, subclass, proto);
-+			} else {
-+				printf("PROGRAM=\"check-ptp-camera %02d/%02d/%02d\"", class, subclass, proto);
-+			}
- 			has_valid_rule = 1;
- 		} else {
- 			if (class == 666) {
-@@ -568,6 +582,9 @@
- 		}
- 	}
- 	if (has_valid_rule != 0) {
-+		if (pdata->script != NULL || pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL)
-+			printf(", ");
-+
- 		if (pdata->script != NULL) {
- 			printf("RUN+=\"%s\"\n", pdata->script);
- 		} else if (pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) {
-@@ -589,7 +606,8 @@
- 			printf("\n");
- 		} else {
- 			printf("\n");
--			FATAL("udev_camera_func(): illegal branch");
-+			if (pdata->version < UDEV_136)
-+				FATAL("udev_camera_func(): illegal branch");
- 		}
- 	}
- 	return 0;
-@@ -1118,12 +1136,16 @@
- 	 fdi_device_end_func
- 	},
- 	{"udev-rules",
--	 "udev rules file either for pre-0.98 or 0.98 and later",
--	 "Put it into /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
-+	 "udev rules file",
-+	 "For modes \"pre-0.98\" and \"0.98\" (and later), put it into\n"
-+	 "        /etc/udev/rules.d/90-libgphoto2.rules, set file mode, owner, group\n"
- 	 "        or add script to run. This rule files also uses the\n"
- 	 "        check-ptp-camera script included in libgphoto2 source. Either put it to\n"
- 	 "        /lib/udev/check-ptp-camera or adjust the path in the generated rules file.\n"
--	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.",
-+	 "        If you give a script parameter, the mode, owner, group parameters will be ignored.\n"
-+	 "        For mode \"136\" put it into /lib/udev/rules.d/40-libgphoto2.rules;\n"
-+	 "        you can still use mode/owner/group, but the preferred mode of operation\n"
-+	 "        is to use udev-extras for dynamic access permissions.\n",
- 	 "[script <PATH_TO_SCRIPT>|version <version>|mode <mode>|owner <owner>|group <group>]*",
- 	 udev_begin_func, 
- 	 udev_camera_func,
-
- 	  	 


