diff --git a/hardware/misc/libgphoto2/actions.py b/hardware/misc/libgphoto2/actions.py index 7e4a89f3d6..0ba2310b21 100644 --- a/hardware/misc/libgphoto2/actions.py +++ b/hardware/misc/libgphoto2/actions.py @@ -14,10 +14,8 @@ import os def setup(): shelltools.export("AUTOPOINT", "true") autotools.autoreconf("-fi") - autotools.configure("--with-rpmbuild=/bin/false \ - --with-drivers=all \ + autotools.configure("--with-drivers=all \ --enable-nls \ - --without-aalib \ --disable-rpath \ --disable-lockdev \ --disable-resmgr \ @@ -31,16 +29,16 @@ def build(): autotools.make() def install(): - autotools.rawInstall("DESTDIR=%s \ - udevscriptdir=/lib/udev" % get.installDIR()) + autotools.rawInstall("DESTDIR=%s udevscriptdir=/lib/udev" % get.installDIR()) - HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" +# HAL_FDI="usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" UDEV_RULES="lib/udev/rules.d/40-libgphoto2.rules" + HWDB_RULES="lib/udev/rules.d/20-libgphoto2.hwdb" CAM_LIST="usr/lib/libgphoto2/print-camera-list" CAM_LIBS="usr/lib/libgphoto2/%s" % get.srcVERSION() # Create hal directory - pisitools.dodir(shelltools.dirName(HAL_FDI)) +# pisitools.dodir(shelltools.dirName(HAL_FDI)) # Export the necessary env variables shelltools.export("CAMLIBS", "%s/%s" % (get.installDIR(), CAM_LIBS)) @@ -48,14 +46,18 @@ def install(): shelltools.export("LD_LIBRARY_PATH", "%s/usr/lib/" % get.installDIR()) # Generate HAL FDI file - f = open(os.path.join(get.installDIR(), HAL_FDI), "w") - f.write(os.popen("%s/%s hal-fdi" % (get.installDIR(), CAM_LIST)).read()) - f.close() +# f = open(os.path.join(get.installDIR(), HAL_FDI), "w") +# f.write(os.popen("%s/%s hal-fdi" % (get.installDIR(), CAM_LIST)).read()) +# f.close() # Generate UDEV rule which will replace the HAL FDI when HAL is deprecated pisitools.dodir("/lib/udev/rules.d") f = open(os.path.join(get.installDIR(), UDEV_RULES), "w") - f.write(os.popen("%s/%s udev-rules version 136" % (get.installDIR(), CAM_LIST)).read()) + f.write(os.popen("%s/%s udev-rules version 201" % (get.installDIR(), CAM_LIST)).read()) + f.close() + + f = open(os.path.join(get.installDIR(), HWDB_RULES), "w") + f.write(os.popen("%s/%s hwdb" % (get.installDIR(), CAM_LIST)).read()) f.close() pisitools.removeDir("/usr/share/doc/libgphoto2_port") diff --git a/hardware/misc/libgphoto2/pspec.xml b/hardware/misc/libgphoto2/pspec.xml index 95da4373b3..54ead36335 100644 --- a/hardware/misc/libgphoto2/pspec.xml +++ b/hardware/misc/libgphoto2/pspec.xml @@ -5,18 +5,19 @@ libgphoto2 http://www.gphoto.org/ - PisiLinux Community + Pisilinux Community admins@pisilinux.org - GPLv2 + LGPL-2.1 library Library that implements support for numerous digital cameras libgphoto2 is the core library designed to allow access to digital camera by external programs. - mirrors://sourceforge/project/gphoto/libgphoto/2.5.26/libgphoto2-2.5.26.tar.bz2 + mirrors://sourceforge/project/gphoto/libgphoto/2.5.28/libgphoto2-2.5.28.tar.xz doxygen gd-devel tiff-devel + curl-devel libusb-devel libexif-devel libxml2-devel @@ -36,19 +37,16 @@ libjpeg-turbo - /usr/bin /lib/udev /usr/lib /usr/share/libgphoto2 - /usr/share/hal/fdi + /lib/udev/rules.d /usr/share/locale - /usr/share/man - /usr/share/doc/libgphoto2/README - /usr/share/doc/libgphoto2/COPYING + /usr/share/doc/libgphoto2 - System.Package + @@ -56,10 +54,8 @@ libgphoto2-docs Documentation for libgphoto2 - /usr/share/doc/libgphoto2 /usr/share/doc/libgphoto2/camlibs - /usr/share/doc/libgphoto2/apidocs.html - /usr/share/doc/libgphoto2/linux-hotplug + /usr/share/doc/libgphoto2/libgphoto2-api.html @@ -71,7 +67,7 @@ libgphoto2 - /usr/bin/gphoto2-config* + /usr/bin/gphoto2-config /usr/bin/gphoto2-port-config /usr/include/gphoto2 /usr/lib/pkgconfig @@ -80,6 +76,13 @@ + + 2022-01-17 + 2.5.28 + Version bump. + fury + uglyside@yandex.ru + 2021-01-19 2.5.26