Merge pull request #202 from jim-easterbrook/devel

Devel

Author: jim-easterbrook

.github/workflows/build-gphoto2-wheels.yml

@@ -24,7 +24,7 @@ jobs:
             target: 14.0
             arch: arm64
     env:
-      GPHOTO_SRC: https://github.com/gphoto/libgphoto2/releases/download/v2.5.33/libgphoto2-2.5.33.tar.xz
+      GPHOTO_SRC: https://github.com/gphoto/libgphoto2/releases/download/v2.5.34/libgphoto2-2.5.34.tar.xz
       GPHOTO2_ROOT: libgphoto2/local_install
       MACOSX_DEPLOYMENT_TARGET: ${{ matrix.target }}
     steps:

CHANGELOG.txt

@@ -1,6 +1,6 @@
 python-gphoto2 - Python interface to libgphoto2
 http://github.com/jim-easterbrook/python-gphoto2
-Copyright (C) 2014-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
+Copyright (C) 2014-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 
 This file is part of python-gphoto2.
 
@@ -19,6 +19,9 @@ License along with python-gphoto2.  If not, see
 <https://www.gnu.org/licenses/>.
 
 
+Changes in 2.6.4:
+  1/ Binary wheels include libgphoto2 v2.5.34
+
 Changes in 2.6.3:
   1/ Binary wheels include libgphoto2 v2.5.33
 

README.rst

@@ -1,4 +1,4 @@
-python-gphoto2 v\ 2.6.3
+python-gphoto2 v\ 2.6.4
 =======================
 
 python-gphoto2 is a comprehensive Python interface (or binding) to libgphoto2_.

developer/Doxyfile

@@ -506,7 +506,7 @@ HIDE_IN_BODY_DOCS      = NO
 # will be excluded. Set it to YES to include the internal documentation.
 # The default value is: NO.
 
-INTERNAL_DOCS          = NO
+INTERNAL_DOCS          = YES
 
 # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
 # names in lower-case letters. If set to YES, upper-case letters are also

developer/README.rst

@@ -14,7 +14,7 @@ Using local libgphoto2
 
 To build python-gphoto2 with a different version of libgphoto2 than the one installed on your system you first need to build a local copy of libgphoto2. Download and extract the libgphoto2 source, change to the source directory and then configure, build and install::
 
-    ./configure --prefix=$PWD/local_install CFLAGS="-std=gnu99 -g -O2"
+    ./configure --prefix=$PWD/local_install --enable-vusb
     make
     make install
 
@@ -55,6 +55,7 @@ Differences found so far::
     2.5.31    No change
     2.5.32    Add GP_MIME_MPO, GP_MIME_QTKN, GP_MIME_QTKT, and GP_MIME_RAF constants
     2.5.33    No change
+    2.5.44    Add GP_MIME_DNG constant
 
 Documentation
 -------------

pyproject.toml

@@ -1,6 +1,6 @@
 # python-gphoto2 - Python interface to libgphoto2
 # http://github.com/jim-easterbrook/python-gphoto2
-# Copyright (C) 2023  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2023-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 #
 # This file is part of python-gphoto2.
 #
@@ -19,19 +19,22 @@
 # <https://www.gnu.org/licenses/>.
 
 [build-system]
-requires = ["setuptools >= 59.6", "toml"]
+requires = [
+    "setuptools >= 59.6, < 61.0; python_version < '3.9'",
+    "setuptools >= 77.0; python_version >= '3.9'",
+    "toml; python_version < '3.9'"
+]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "gphoto2"
 description = "Python interface to libgphoto2"
 readme = "README.rst"
-license = {text = "GNU LGPL"}
+license = "LGPL-3.0-or-later"
 authors = [{name = "Jim Easterbrook", email = "jim@jim-easterbrook.me.uk"}]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
     "Operating System :: MacOS",
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: POSIX",

setup.py

@@ -1,6 +1,6 @@
 # python-gphoto2 - Python interface to libgphoto2
 # http://github.com/jim-easterbrook/python-gphoto2
-# Copyright (C) 2014-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2014-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 #
 # This file is part of python-gphoto2.
 #
@@ -35,8 +35,7 @@
     # using a local build of libgphoto2
     gphoto2_dir = os.environ['GPHOTO2_ROOT']
     gphoto2_dir = os.path.expanduser(gphoto2_dir)
-    if not os.path.isabs(gphoto2_dir):
-        raise RuntimeError('GPHOTO2_ROOT is not an absolute path')
+    gphoto2_dir = os.path.abspath(gphoto2_dir)
     print('Using libgphoto2 from {}'.format(gphoto2_dir))
     for root, dirs, files in os.walk(gphoto2_dir):
         if 'libgphoto2.pc' in files:
@@ -58,22 +57,27 @@
             package_data['gphoto2.libgphoto2'].append(name)
     # get cam libs
     packages.append('gphoto2.libgphoto2.camlibs')
-    lib_dir = subprocess.check_output(
+    camlib_dir = subprocess.check_output(
         ['pkg-config', '--variable=driverdir', 'libgphoto2'],
         universal_newlines=True).strip()
-    package_dir['gphoto2.libgphoto2.camlibs'] = os.path.relpath(lib_dir)
+    package_dir['gphoto2.libgphoto2.camlibs'] = os.path.relpath(camlib_dir)
     package_data['gphoto2.libgphoto2.camlibs'] = ['*.so']
     # get io libs
     packages.append('gphoto2.libgphoto2.iolibs')
-    lib_dir = subprocess.check_output(
+    iolib_dir = subprocess.check_output(
         ['pkg-config', '--variable=driverdir', 'libgphoto2_port'],
         universal_newlines=True).strip()
-    package_dir['gphoto2.libgphoto2.iolibs'] = os.path.relpath(lib_dir)
+    if not iolib_dir:
+        iolib_vsn = subprocess.check_output(
+            ['pkg-config', '--variable=VERSION', 'libgphoto2_port'],
+            universal_newlines=True).strip()
+        iolib_dir = os.path.join(lib_dir, 'libgphoto2_port', iolib_vsn)
+    package_dir['gphoto2.libgphoto2.iolibs'] = os.path.relpath(iolib_dir)
     package_data['gphoto2.libgphoto2.iolibs'] = []
-    for name in os.listdir(lib_dir):
+    for name in os.listdir(iolib_dir):
         if name == 'vusb.so':
             packages.append('gphoto2.libgphoto2.vusb')
-            package_dir['gphoto2.libgphoto2.vusb'] = os.path.relpath(lib_dir)
+            package_dir['gphoto2.libgphoto2.vusb'] = os.path.relpath(iolib_dir)
             package_data['gphoto2.libgphoto2.vusb'] = [name]
         elif name.endswith('.so'):
             package_data['gphoto2.libgphoto2.iolibs'].append(name)
@@ -183,6 +187,10 @@
         # python-gphoto2 version
         version = long_description.split('\n')[0].split()[-1]
 
+    classifiers = metadata['project']['classifiers']
+    classifiers.append('License :: OSI Approved :: GNU Lesser General Public'
+                       ' License v3 or later (LGPLv3+)')
+
     setup_kwds.update(
         name = metadata['project']['name'],
         version = version,
@@ -191,9 +199,9 @@
         author = metadata['project']['authors'][0]['name'],
         author_email = metadata['project']['authors'][0]['email'],
         url = metadata['project']['urls']['homepage'],
-        classifiers = metadata['project']['classifiers'],
+        classifiers = classifiers,
         platforms = metadata['tool']['setuptools']['platforms'],
-        license = metadata['project']['license']['text'],
+        license = 'GNU LGPL',
         zip_safe = metadata['tool']['setuptools']['zip-safe'],
         )
 

src/gphoto2/abilities_list.i

@@ -1,6 +1,6 @@
 // python-gphoto2 - Python interface to libgphoto2
 // http://github.com/jim-easterbrook/python-gphoto2
-// Copyright (C) 2014-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+// Copyright (C) 2014-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
 //
 // This file is part of python-gphoto2.
 //
@@ -65,18 +65,15 @@ LEN_MEMBER_FUNCTION(_CameraAbilitiesList, gp_abilities_list_count)
   if (PyErr_Occurred() != NULL) goto fail;
 }
 %extend _CameraAbilitiesList {
+  %fragment("gphoto2_error");
   void __getitem__(int idx, CameraAbilities *abilities) {
     if (idx < 0 || idx >= gp_abilities_list_count($self)) {
       PyErr_SetString(PyExc_IndexError, "CameraAbilitiesList index out of range");
       return;
     }
-    {
-      int error = gp_abilities_list_get_abilities($self, idx, abilities);
-      if (error < GP_OK) {
-        GPHOTO2_ERROR(error)
-        return;
-      }
-    }
+    if (gphoto2_error(gp_abilities_list_get_abilities(
+        $self, idx, abilities)))
+      return;
   }
 };
 

src/gphoto2/camera.i

@@ -1,6 +1,6 @@
 // python-gphoto2 - Python interface to libgphoto2
 // http://github.com/jim-easterbrook/python-gphoto2
-// Copyright (C) 2014-25  Jim Easterbrook  jim@jim-easterbrook.me.uk
+// Copyright (C) 2014-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 //
 // This file is part of python-gphoto2.
 //
@@ -58,6 +58,10 @@ DEFAULT_EXCEPTION
 // Many functions accept NULL context value
 DEFAULT_CONTEXT
 
+// SWIG ref counting
+%feature("ref") _Camera "gp_camera_ref($this);"
+%feature("unref") _Camera "gp_camera_unref($this);"
+
 // gp_camera_get_abilities() returns a pointer in an output parameter
 CALLOC_ARGOUT(CameraAbilities *abilities)
 
@@ -78,11 +82,9 @@ NEW_ARGOUT(CameraList *, gp_list_new, gp_list_unref)
 %typemap(default) CameraFile *camera_file (int new_file = 0) %{
   $1 = NULL;
 %}
-%typemap(check) CameraFile *camera_file {
+%typemap(check, fragment="gphoto2_error") CameraFile *camera_file {
   if (!$1) {
-    int error = gp_file_new(&$1);
-    if (error < GP_OK) {
-      GPHOTO2_ERROR(error)
+    if (gphoto2_error(gp_file_new(&$1))) {
       SWIG_fail;
     }
     new_file$argnum = 1;
@@ -139,9 +141,9 @@ CALLOC_ARGOUT(CameraFilePath *path)
   $result = SWIG_AppendOutput($result, PyLong_FromUnsignedLongLong(*$2));
 }
 
-// Add default constructor and destructor to _Camera
+// Add default constructor to _Camera
 DEFAULT_CTOR(_Camera, gp_camera_new)
-DEFAULT_DTOR(_Camera, gp_camera_unref)
+
 %ignore gp_camera_ref;
 %ignore gp_camera_unref;
 

src/gphoto2/common/macros.i

@@ -1,6 +1,6 @@
 // python-gphoto2 - Python interface to libgphoto2
 // http://github.com/jim-easterbrook/python-gphoto2
-// Copyright (C) 2014-24  Jim Easterbrook  jim@jim-easterbrook.me.uk
+// Copyright (C) 2014-26  Jim Easterbrook  jim@jim-easterbrook.me.uk
 //
 // This file is part of python-gphoto2.
 //
@@ -37,13 +37,39 @@
 }
 %enddef
 
-%define GPHOTO2_ERROR(error)
-PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
-%enddef
+// Get PyExc_GPhoto2Error object
+%fragment("_declare_GPhoto2Error", "header") {
+PyObject *PyExc_GPhoto2Error = NULL;
+}
+%fragment("_import_GPhoto2Error", "init", fragment="_declare_GPhoto2Error") {
+{
+  PyObject *module = PyImport_ImportModule("gphoto2");
+  if (module) {
+    PyExc_GPhoto2Error = PyObject_GetAttrString(module, "GPhoto2Error");
+    SWIG_Py_DECREF(module);
+  }
+  if (!PyExc_GPhoto2Error)
+#if SWIG_VERSION >= 0x040400
+    return -1;
+#else
+    return NULL;
+#endif
+}
+}
+
+// Set Python exception if result is a failure
+%fragment("gphoto2_error", "header", fragment="_import_GPhoto2Error") {
+static int gphoto2_error(int error) {
+  if (error < GP_OK) {
+    PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
+    return 1;
+  }
+  return 0;
+};
+}
 
 %define PLAIN_ARGOUT(typepattern)
-%typemap(in, numinputs=0) typepattern ($*1_type temp) {
-  temp = NULL;
+%typemap(in, numinputs=0) typepattern ($*1_type temp = NULL) {
   $1 = &temp;
 }
 %typemap(argout) typepattern {
@@ -55,7 +81,7 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 %define CALLOC_ARGOUT(typepattern)
 %typemap(in, numinputs=0) typepattern () {
   $1 = ($1_type)calloc(1, sizeof($*1_type));
-  if ($1 == NULL) {
+  if (!$1) {
     PyErr_SetString(PyExc_MemoryError, "Cannot allocate " "$*1_type");
     SWIG_fail;
   }
@@ -71,16 +97,14 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 %enddef
 
 %define NEW_ARGOUT(typepattern, alloc_func, free_func)
-%typemap(in, numinputs=0) typepattern () {
-  int error = alloc_func(&$1);
-  if (error < GP_OK) {
+%typemap(in, numinputs=0, fragment="gphoto2_error") typepattern () {
+  if (gphoto2_error(alloc_func(&$1))) {
     $1 = NULL;
-    GPHOTO2_ERROR(error)
     SWIG_fail;
   }
 }
 %typemap(freearg) typepattern {
-  if ($1 != NULL) {
+  if ($1) {
     free_func($1);
   }
 }
@@ -93,11 +117,10 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 
 %define DEFAULT_CTOR(type, function)
 %extend type {
+  %fragment("gphoto2_error");
   type() {
     struct type *result;
-    int error = function(&result);
-    if (error < GP_OK)
-      GPHOTO2_ERROR(error)
+    gphoto2_error(function(&result));
     return result;
   }
 };
@@ -106,9 +129,9 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 %define DEFAULT_DTOR(name, free_func)
 %delobject free_func;
 %extend name {
+  %fragment("gphoto2_error");
   ~name() {
-    int error = free_func($self);
-    if (error < GP_OK) GPHOTO2_ERROR(error)
+    gphoto2_error(free_func($self));
   }
 };
 %enddef
@@ -117,6 +140,7 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 %define MEMBER_FUNCTION(type, member_rtn, member, member_args,
                         function, function_args, thread_allow)
 %extend type {
+  %fragment("gphoto2_error");
   member_rtn member member_args {
 #if #thread_allow != ""
     SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -125,7 +149,7 @@ PyErr_SetObject(PyExc_GPhoto2Error, PyInt_FromLong(error));
 #if #thread_allow != ""
     SWIG_PYTHON_THREAD_END_ALLOW;
 #endif
-    if (result < GP_OK) GPHOTO2_ERROR(result)
+    gphoto2_error(result);
 #if #member_rtn == "int" || #member_rtn == "static int"
     return result;
 #endif