From 04086c008fcc14f7ff9bff63cd0b69158897610b889e9e26c22124d9b39aa30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 18 Mar 2013 14:16:26 +0000 Subject: [PATCH] Accepting request 159669 from devel:ARM:AArch64:Factory - add use-openat-if-available.patch: * prefer openat over deprecated open syscall (fixes aarch64) OBS-URL: https://build.opensuse.org/request/show/159669 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/v4l-utils?expand=0&rev=23 --- use-openat-if-available.patch | 32 ++++++++++++++++++++++++++++++++ v4l-utils.changes | 6 ++++++ v4l-utils.spec | 4 +++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 use-openat-if-available.patch diff --git a/use-openat-if-available.patch b/use-openat-if-available.patch new file mode 100644 index 0000000..f9c00be --- /dev/null +++ b/use-openat-if-available.patch @@ -0,0 +1,32 @@ +From ac8eb4d8e1c16b907e795da123a032869c77c56f Mon Sep 17 00:00:00 2001 +From: Riku Voipio +Date: Tue, 22 Jan 2013 12:44:48 +0200 +Subject: [PATCH] libv4lsyscall-priv.h: use openat when available + +New architectures such as 64-Bit arm build kernels without legacy +system calls - Such as the the no-at system calls. Thus, use +SYS_openat whenever it is available. + +Signed-off-by: Riku Voipio +--- + lib/libv4lconvert/libv4lsyscall-priv.h | 5 +++++ + 1 file changed, 5 insertions(+) + +Index: v4l-utils-0.8.9/lib/libv4lconvert/libv4lsyscall-priv.h +=================================================================== +--- v4l-utils-0.8.9.orig/lib/libv4lconvert/libv4lsyscall-priv.h ++++ v4l-utils-0.8.9/lib/libv4lconvert/libv4lsyscall-priv.h +@@ -72,8 +72,13 @@ typedef off_t __off_t; + + #ifndef CONFIG_SYS_WRAPPER + ++#ifdef SYS_openat ++#define SYS_OPEN(file, oflag, mode) \ ++ syscall(SYS_openat, AT_FDCWD, (const char *)(file), (int)(oflag), (mode_t)(mode)) ++#else + #define SYS_OPEN(file, oflag, mode) \ + syscall(SYS_open, (const char *)(file), (int)(oflag), (mode_t)(mode)) ++#endif + #define SYS_CLOSE(fd) \ + syscall(SYS_close, (int)(fd)) + #define SYS_IOCTL(fd, cmd, arg) \ diff --git a/v4l-utils.changes b/v4l-utils.changes index a928ac9..30a9f7b 100644 --- a/v4l-utils.changes +++ b/v4l-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 16 21:59:51 UTC 2013 - dmueller@suse.com + +- add use-openat-if-available.patch: + * prefer openat over deprecated open syscall (fixes aarch64) + ------------------------------------------------------------------- Fri Nov 2 21:30:16 UTC 2012 - asterios.dramis@gmail.com diff --git a/v4l-utils.spec b/v4l-utils.spec index b5999c2..382e5b0 100644 --- a/v4l-utils.spec +++ b/v4l-utils.spec @@ -1,7 +1,7 @@ # # spec file for package v4l-utils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,7 @@ Source100: baselibs.conf Patch0: disable_rds_compilation.patch # PATCH-FIX-UPSTREAM udev-rules-dir.patch fcrozat@suse.com -- allow udev rules directory to be overridden Patch1: udev-rules-dir.patch +Patch2: use-openat-if-available.patch # Only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick BuildRequires: kernel-headers @@ -142,6 +143,7 @@ qv4l2 is a test control and streaming test application for video4linux. %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build make CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags}" %{?_smp_mflags}