Upgrade: libdc1394 version to 2.2.7

SPECS-EXTENDED/libdc1394/libdc1394-sdl.patch

@@ -0,0 +1,23 @@
+diff -Naur libdc1394-2.2.6.old/configure.ac libdc1394-2.2.6/configure.ac
+--- libdc1394-2.2.6.old/configure.ac	2022-05-31 18:11:17.320426983 +0200
++++ libdc1394-2.2.6/configure.ac	2022-05-31 18:11:32.882714398 +0200
+@@ -45,12 +45,6 @@
+     [AC_DEFINE(HAVE_LIBUSB,[],[Defined if libusb is present])],
+     [AC_MSG_WARN([libusb-1.0 not found])])
+
+-MIN_SDL_VERSION=1.2.4
+-AH_TEMPLATE(HAVE_LIBSDL, [SDL library])
+-AM_PATH_SDL($MIN_SDL_VERSION, [AC_DEFINE(HAVE_LIBSDL) HAVE_LIBSDL="yes"])
+-AC_SUBST(SDL_CFLAGS)
+-AC_SUBST(SDL_LIBS)
+-
+ case "$host" in
+ *-*-linux*)
+     have_linux=true
+@@ -233,4 +227,4 @@
+       Build V4L examples:               ${VIDEXAMPLESMSG}"
+ fi
+ dnl extra newline:
+-echo ""
+\ No newline at end of file
++echo ""

SPECS-EXTENDED/libdc1394/libdc1394.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libdc1394-2.2.2.tar.gz": "ff8744a92ab67a276cfaf23fa504047c20a1ff63262aef69b4f5dbaa56a45059"
+  "libdc1394-2.2.7.tar.gz": "537ceb78dd3cef271a183f4a176191d1cecf85f025520e6bd3758b0e19e6609f"
  }
 }

SPECS-EXTENDED/libdc1394/libdc1394.spec

@@ -1,28 +1,30 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 
-#define svn_snapshot .svn459  
-#define real_version 2.1.0
 %define svn_build %{?svn_snapshot:1}%{!?svn_snapshot:0}
+%global sover 26
 
 Summary: 1394-based digital camera control library
 Name: libdc1394
-Version: 2.2.2
+Version: 2.2.7
 Release: 15%{?dist}
 License: LGPLv2+
 URL: http://sourceforge.net/projects/libdc1394/
-Source: http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/%{version}/libdc1394-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/project/%{name}/%{name}-2/%{version}/%{name}-%{version}.tar.gz
+Patch0:     %{name}-sdl.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires:  gcc
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  make
 BuildRequires: kernel-headers
 BuildRequires: libraw1394-devel libusb1-devel
 BuildRequires: doxygen
 BuildRequires: perl-interpreter
 BuildRequires: libX11-devel libXv-devel
-%if %{svn_build}
 BuildRequires: libtool
-%endif
 
 %description
 Libdc1394 is a library that is intended to provide a high level programming
@@ -54,52 +56,59 @@ This package contains tools that are useful when working and
 developing with %{name}.
 
 %prep
-%setup -q -n libdc1394-%{version}
+%autosetup -p1
 
 %build
-%if %{svn_build}
-cp /usr/share/libtool/ltmain.sh .
-aclocal
-autoheader
-autoconf
-automake --add-missing
-%endif
+autoreconf -vif
 %configure --disable-static --enable-doxygen-html --enable-doxygen-dot
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
-make doc
+%make_build
+%make_build doc
 
 %install
-%{__rm} -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+%make_install
+
 for p in grab_color_image grab_gray_image grab_partial_image ladybug grab_partial_pvn; do
-	%{__install} -p -m 0644 -s examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p
+	install  -p -m 0755 -s examples/.libs/$p %{buildroot}%{_bindir}/dc1394_$p
 done
-%{__install} -p -m 0644 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview
+install -p -m 0755 examples/dc1394_multiview %{buildroot}%{_bindir}/dc1394_multiview
+
 for f in grab_color_image grab_gray_image grab_partial_image; do
 	mv %{buildroot}%{_mandir}/man1/$f.1 %{buildroot}%{_mandir}/man1/dc1394_$f.1
 done
 
-%ldconfig_scriptlets
+find %{buildroot} -name "*.la" -delete
+
+%{?ldconfig_scriptlets}
 
 %files
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_libdir}/libdc1394*.so.*
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
+%{_libdir}/%{name}.so.%{sover}*
 
 %files devel
 %doc examples/*.h examples/*.c
 %{_includedir}/dc1394/
-%{_libdir}/libdc1394*.so
+%{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}-2.pc
-%exclude %{_libdir}/*.la
+
 
 %files docs
 %doc doc/html/*
 
 %files tools
-%{_bindir}/dc1394_*
-%{_mandir}/man1/dc1394_*.1.gz
+%{_bindir}/dc1394_grab_color_image
+%{_bindir}/dc1394_grab_gray_image
+%{_bindir}/dc1394_grab_partial_image
+%{_bindir}/dc1394_grab_partial_pvn
+%{_bindir}/dc1394_ladybug
+%{_bindir}/dc1394_multiview
+%{_bindir}/dc1394_reset_bus
+%{_mandir}/man1/dc1394_grab_color_image.*
+%{_mandir}/man1/dc1394_grab_gray_image.*
+%{_mandir}/man1/dc1394_grab_partial_image.*
+%{_mandir}/man1/dc1394_multiview.*
+%{_mandir}/man1/dc1394_reset_bus.*
+%{_mandir}/man1/dc1394_vloopback.*
 
 %changelog
 * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.2.2-15

cgmanifest.json

@@ -9001,8 +9001,8 @@
         "type": "other",
         "other": {
           "name": "libdc1394",
-          "version": "2.2.2",
-          "downloadUrl": "http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/2.2.2/libdc1394-2.2.2.tar.gz"
+          "version": "2.2.7",
+          "downloadUrl": "http://downloads.sourceforge.net/project/libdc1394/libdc1394-2/2.2.7/libdc1394-2.2.7.tar.gz"
         }
       }
     },