pool/libunicap
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity
Files
factory
libunicap/unicap-implicit-fortify-decl.patch
Dave Plater 547770a255 Accepting request 811707 from home:plater 
- Fix Factory build, add patches from Fedora:
  libunicap-0.9.12-gcc10.patch, libunicap-0.9.12-arraycmp.patch,
  libunicap-0.9.12-datadirname.patch, libunicap-bz641623.patch
  and libunicap-0.9.12-memerrs.patch

OBS-URL: https://build.opensuse.org/request/show/811707
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libunicap?expand=0&rev=21
2020-06-05 09:22:08 +00:00

282 lines
10 KiB
Diff
Raw Permalink Blame History

Index: libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c
===================================================================
--- libunicap-0.9.12.orig/cpi/v4l2cpi/buffermanager.c 2010-08-17 18:13:08.000000000 +0200
+++ libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c 2020-06-05 10:40:34.274087670 +0200
@@ -1,12 +1,13 @@
#include "config.h"
+#include <unistd.h>
+#include <sys/mman.h>
#include <linux/types.h>
#include <linux/videodev2.h>
#include <semaphore.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <sys/mman.h>
#if V4L2_DEBUG
#define DEBUG
@@ -15,10 +16,12 @@
#include "buffermanager.h"
+
#define MAX_BUFFERS 16
#if USE_LIBV4L
- #define OPEN v4l2_open
+#include <libv4l2.h>
+#define OPEN v4l2_open
#define CLOSE v4l2_close
#define IOCTL v4l2_ioctl
#define MMAP v4l2_mmap
Index: libunicap-0.9.12/cpi/euvccam/euvccam_colorproc.c
===================================================================
--- libunicap-0.9.12.orig/cpi/euvccam/euvccam_colorproc.c 2010-08-19 20:04:25.000000000 +0200
+++ libunicap-0.9.12/cpi/euvccam/euvccam_colorproc.c 2020-06-05 10:40:34.274087670 +0200
@@ -18,6 +18,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+#include <string.h>
#include "euvccam_cpi.h"
#include "debayer.h"
Index: libunicap-0.9.12/cpi/euvccam/euvccam_usb.c
===================================================================
--- libunicap-0.9.12.orig/cpi/euvccam/euvccam_usb.c 2010-03-01 12:42:38.000000000 +0200
+++ libunicap-0.9.12/cpi/euvccam/euvccam_usb.c 2020-06-05 10:40:34.274087670 +0200
@@ -18,6 +18,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+#include <stdio.h>
#include <sys/types.h>
#include <ctype.h>
#include <dirent.h>
Index: libunicap-0.9.12/cpi/euvccam/logging.c
===================================================================
--- libunicap-0.9.12.orig/cpi/euvccam/logging.c 2010-01-19 08:52:22.000000000 +0200
+++ libunicap-0.9.12/cpi/euvccam/logging.c 2020-06-05 10:40:34.274087670 +0200
@@ -18,9 +18,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
+#include <string.h>
FILE *g_logfp = NULL;
int g_log_modules_mask = 0xffff;
Index: libunicap-0.9.12/common/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/common/Makefile.am 2010-01-17 15:17:21.000000000 +0200
+++ libunicap-0.9.12/common/Makefile.am 2020-06-05 10:40:36.954197456 +0200
@@ -1,5 +1,5 @@
-INCLUDES=-I../include
+AM_CPPFLAGS= -include $(top_builddir)/config.h -I../include
noinst_LTLIBRARIES = libucutils.la
libucutils_la_SOURCES = queue.c queue.h ucutil.h
-libucutils_la_LIBADD =
\ No newline at end of file
+libucutils_la_LIBADD =
Index: libunicap-0.9.12/cpi/dcam/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/dcam/Makefile.am 2010-05-27 09:24:46.000000000 +0200
+++ libunicap-0.9.12/cpi/dcam/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I../include -I../../include -I../../ -I../../common @LIBRAW1394_PACKAGE_CFLAGS@
+INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include -I../../ -I../../common @LIBRAW1394_PACKAGE_CFLAGS@
if ENABLE_STATIC_CPI
noinst_LTLIBRARIES = libdcam.la
@@ -14,7 +14,7 @@ libcpidir = $(libdir)/unicap$(pkg_versio
libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@
libdcam_la_CFLAGS = -fno-strict-aliasing -Wl,-z,defs
-libdcam_la_LDFLAGS = -module -avoid-version
+libdcam_la_LDFLAGS = -module -shared -export-dynamic -avoid-version
libdcam_la_SOURCES = \
1394util.c \
Index: libunicap-0.9.12/cpi/euvccam/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/euvccam/Makefile.am 2010-08-19 19:52:27.000000000 +0200
+++ libunicap-0.9.12/cpi/euvccam/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,4 +1,4 @@
-INCLUDES = -I../include -I../../include -I../../ -I../../common
+INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include -I../../ -I../../common
if ENABLE_STATIC_CPI
noinst_LTLIBRARIES=libeuvccam_cpi.la
@@ -10,8 +10,7 @@ endif
libcpidir = $(libdir)/unicap$(pkg_version)/cpi
#libeuvccam_cpi_la_CFLAGS=-msse2 -O2 -g
-libeuvccam_cpi_la_CFLAGS=-O2 -g
-libeuvccam_cpi_la_LDFLAGS=-module -avoid-version
+libeuvccam_cpi_la_LDFLAGS= -module -shared -export-dynamic -avoid-version
libeuvccam_cpi_la_SOURCES= \
euvccam_cpi.c euvccam_cpi.h \
Index: libunicap-0.9.12/cpi/thing/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/thing/Makefile.am 2010-01-17 09:49:29.000000000 +0200
+++ libunicap-0.9.12/cpi/thing/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I../include -I../../include
+INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include
libcpi_LTLIBRARIES = libthing.la
Index: libunicap-0.9.12/cpi/v4l/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/v4l/Makefile.am 2010-05-27 09:24:09.000000000 +0200
+++ libunicap-0.9.12/cpi/v4l/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I../include -I../../include -I../../common
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I../include -I../../include -I../../common
if ENABLE_STATIC_CPI
noinst_LTLIBRARIES = libv4l.la
@@ -12,7 +12,7 @@ endif
libcpidir = $(libdir)/unicap$(pkg_version)/cpi
-libv4l_la_LDFLAGS = -module -avoid-version
+libv4l_la_LDFLAGS = -module -shared -export-dynamic -avoid-version
libv4l_la_SOURCES = \
v4l.c v4l.h
Index: libunicap-0.9.12/cpi/v4l2cpi/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/v4l2cpi/Makefile.am 2010-07-05 18:27:15.000000000 +0200
+++ libunicap-0.9.12/cpi/v4l2cpi/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I../include -I../../include -I../../common
+INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include -I../../common
if ENABLE_STATIC_CPI
noinst_LTLIBRARIES = libv4l2cpi.la
@@ -12,7 +12,7 @@ endif
libcpidir = $(libdir)/unicap$(pkg_version)/cpi
-libv4l2cpi_la_LDFLAGS = -module -avoid-version
+libv4l2cpi_la_LDFLAGS = -module -shared -export-dynamic -avoid-version
libv4l2cpi_la_CFLAGS = @LIBV4L_CFLAGS@
@@ -22,4 +22,4 @@ libv4l2cpi_la_SOURCES = \
tisuvccam.c tisuvccam.h uvcvideo.h uvc_compat.h \
tiseuvccam.c tiseuvccam.h
-EXTRA_DIST = v4l2_i18n_strings.h
\ No newline at end of file
+EXTRA_DIST = v4l2_i18n_strings.h
Index: libunicap-0.9.12/cpi/vid21394/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/cpi/vid21394/Makefile.am 2010-05-27 09:27:19.000000000 +0200
+++ libunicap-0.9.12/cpi/vid21394/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,5 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I../include -I../../include @LIBRAW1394_PACKAGE_CFLAGS@ -I. -I../../common
+INCLUDES = -include $(top_builddir)/config.h -I../include -I../../include @LIBRAW1394_PACKAGE_CFLAGS@ -I. -I../../common
if ENABLE_STATIC_CPI
noinst_LTLIBRARIES = libvid21394.la
@@ -11,7 +11,7 @@ endif
libcpidir = $(libdir)/unicap$(pkg_version)/cpi
-libvid21394_la_LDFLAGS = -module -avoid-version
+libvid21394_la_LDFLAGS = -module -shared -export-dynamic -avoid-version
libvid21394_la_SOURCES = 1394util.c \
Fcp.h \
@@ -25,4 +25,4 @@ libvid21394_la_SOURCES = 1394util.c \
-libvid21394_la_CFLAGS = -fno-strict-aliasing
\ No newline at end of file
+libvid21394_la_CFLAGS = -fno-strict-aliasing
Index: libunicap-0.9.12/src/Makefile.am
===================================================================
--- libunicap-0.9.12.orig/src/Makefile.am 2010-05-27 09:21:01.000000000 +0200
+++ libunicap-0.9.12/src/Makefile.am 2020-06-05 10:40:34.274087670 +0200
@@ -1,12 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I../include -I../cpi/include
-AM_CPPFLAGS=-DINSTALL_PREFIX="\"$(prefix)\"" -DPKGLIBDIR="\"$(libdir)/unicap$(pkg_version)\"" -DPKG_VERSION="\"@pkg_version@\""
+AM_CPPFLAGS= -include $(top_builddir)/config.h -DINSTALL_PREFIX="\"$(prefix)\"" -DPKGLIBDIR="\"$(libdir)/unicap$(pkg_version)\"" -DPKG_VERSION="\"@pkg_version@\""
lib_LTLIBRARIES = libunicap.la
if ENABLE_STATIC_CPI
libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ @RT_LIBS@ -static
else
-libunicap_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ @RT_LIBS@
+libunicap_la_LDFLAGS = -no-undefined -version-info @lt_major@:@lt_revision@:@lt_age@ @RT_LIBS@
endif
libunicap_la_SOURCES = \
Index: libunicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c
===================================================================
--- libunicap-0.9.12.orig/cpi/v4l2cpi/tiseuvccam.c 2010-01-17 09:49:29.000000000 +0200
+++ libunicap-0.9.12/cpi/v4l2cpi/tiseuvccam.c 2020-06-05 10:40:34.274087670 +0200
@@ -37,7 +37,8 @@
#define FOURCC(a,b,c,d) (unsigned int)((((unsigned int)d)<<24)+(((unsigned int)c)<<16)+(((unsigned int)b)<<8)+a)
#if USE_LIBV4L
- #define OPEN v4l2_open
+#include <libv4l2.h>
+#define OPEN v4l2_open
#define CLOSE v4l2_close
#define IOCTL v4l2_ioctl
#define MMAP v4l2_mmap
Index: libunicap-0.9.12/cpi/v4l2cpi/tisuvccam.c
===================================================================
--- libunicap-0.9.12.orig/cpi/v4l2cpi/tisuvccam.c 2010-01-18 17:14:25.000000000 +0200
+++ libunicap-0.9.12/cpi/v4l2cpi/tisuvccam.c 2020-06-05 10:40:34.274087670 +0200
@@ -39,7 +39,8 @@
#if USE_LIBV4L
- #define OPEN v4l2_open
+#include <libv4l2.h>
+#define OPEN v4l2_open
#define CLOSE v4l2_close
#define IOCTL v4l2_ioctl
#define MMAP v4l2_mmap
Index: libunicap-0.9.12/configure.ac
===================================================================
--- libunicap-0.9.12.orig/configure.ac 2010-09-19 09:16:40.000000000 +0200
+++ libunicap-0.9.12/configure.ac 2020-06-05 10:40:34.274087670 +0200
@@ -38,12 +38,12 @@ AC_SUBST(pkg_version)
AC_CONFIG_MACRO_DIR(m4)
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
-
+LT_INIT([disable-static dlopen pic-only])
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
Reference in New Issue View Git Blame Copy Permalink