commit: 48c7bcf4c79c2d46b732894afee7e6bffb179c36
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep 4 07:30:35 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:39:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=48c7bcf4
media-libs/libv4l: in tree version works
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
media-libs/libv4l/Manifest | 7 --
.../libv4l/files/libv4l-1.6.2-musl-ioctl.patch | 30 ------
.../files/libv4l-1.6.2-musl-open64-mmap64.patch | 108 ---------------------
media-libs/libv4l/files/libv4l-1.6.2-off_t.patch | 16 ---
.../libv4l/files/libv4l-1.6.2-sysmacros.patch | 57 -----------
media-libs/libv4l/libv4l-1.6.2.ebuild | 68 -------------
media-libs/libv4l/metadata.xml | 26 -----
7 files changed, 312 deletions(-)
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
deleted file mode 100644
index 78a5c9b..0000000
--- a/media-libs/libv4l/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libv4l-1.6.2-musl-ioctl.patch 1138 SHA256
fddb0ec60a66fe9963aba4b01d34a03c9f6ee523ca8b8c037ee155428bcb513f SHA512
5051aeff12d5cd538bf2d071ca61437ec2565f2326d610ebf2ba0dce8b65c373ca61ca406d0867f6e2bbcc4601b5bcc1ff0ace9786e5b53395b0f5fe4a103fad
WHIRLPOOL
90b181aa72c1588ad75fedb46061b13d451a4a08f59397c18de0752eb0dd8be1289c04afbaa95e210a1634963bb7d43d640edfcd1d18e163a6f9179096a90161
-AUX libv4l-1.6.2-musl-open64-mmap64.patch 2490 SHA256
d2a94392ace321c4c4a9ad78098ecee53f62402bef987cefd2909191abd24a46 SHA512
3487e905ac08c8a80829c3f75d82f13b098cac48784f0e0620eea4478a1f8e5aa5fd7eadcea3c188120df5c781c0e7dcbf36a63130d95cfadc2633a0e9a11064
WHIRLPOOL
bb7e3820669ab5ae0c6b97cc5bc86c609b605bd9202e97e75ad735af8982b717b09fe1918ebe869b98c76a17392f19a20660ba54f7b5d2160197db0368e875b3
-AUX libv4l-1.6.2-off_t.patch 603 SHA256
ee7cebd020b29a7ed9a92fb2ff5be76d37fd714671c8530dd2ff6eb900b072b9 SHA512
27429e512fd2d6115e68ca3d62e90f3bf0c9ddda9deabee03cca35b653e228a16079fb8e488e6f434eef3eeacaada52c16d413f913b7c3395fa2225f6a7b4931
WHIRLPOOL
fce897fa42306d50b321aed3e5a9db80c8f7bbdbe89cab8bc92a80adaf9d7dc5f1166d5cce2e626289845a6191c413ac92e56b40055aff6fd9f4b3ee8ed44ff7
-AUX libv4l-1.6.2-sysmacros.patch 1821 SHA256
702a8a81073fa35dafdcb69410d0626aaf5af7df2cbe31d135d7ed7e330ab3b2 SHA512
ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
WHIRLPOOL
2e008b1d1e018dde80cd3b435eb7f08a8d4e154d97d74a272817e85604330a22b76de4a7cad814fd13970e4b489a7d1f8398b913114c387087624f5a2aeeecc5
-DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256
d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512
e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
WHIRLPOOL
bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
-EBUILD libv4l-1.6.2.ebuild 1669 SHA256
1e40efbe0562f0f3673c55d13f228c4a87dddc15b9151fa0f68b3f308b4f4887 SHA512
ec1b2af1fc938c91956b89e6d4505c44b00998be37526715912634f53b51be82e930729c11382b76793901020aab3a6110fa66cc942e267897b35a54eae91d7e
WHIRLPOOL
11c2b81a6c852c8a309a526293e9034c08b93640d8eddd1c67b5ee0d093ab2dc0558bb891b8e476c6ed174de9e4ca76d0c980b4435942d5d3730f60457b58578
-MISC metadata.xml 1125 SHA256
1be1fac7b283729b4f1ebc9f53d12d21c6fe65839e7981794633ef8072209558 SHA512
5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7
WHIRLPOOL
e777f9b89fcb3b6626b5ca250606186f60b1f7433ccd3ccbad08fcff88d3b9b66a1ce41a7cca2684e926aa66fb180f29c3be4705e5c4bc893b3a019854213bd4
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
b/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
deleted file mode 100644
index a84fcb0..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-musl-ioctl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-musl defines `int ioctl (int, int, ...);` in <sys/ioctl.h>
-which is different than glibc and uClib.c which use an
-unsigned long int for the second paramater. `man 2 ioctl`
-
-Since there is no single standard here, meh.
-
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c
v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
---- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2015-07-18
14:50:06.220267837 +0000
-+++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:51:08.744265485
+0000
-@@ -72,7 +72,7 @@
- return v4l1_dup(fd);
- }
-
--LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
-+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
- {
- void *arg;
- va_list ap;
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c
v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
---- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2015-07-18
14:50:06.220267837 +0000
-+++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:50:59.348265838
+0000
-@@ -96,7 +96,7 @@
- return v4l2_dup(fd);
- }
-
--LIBV4L_PUBLIC int ioctl(int fd, unsigned long int request, ...)
-+LIBV4L_PUBLIC int ioctl(int fd, int request, ...)
- {
- void *arg;
- va_list ap;
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
b/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
deleted file mode 100644
index 043b9b3..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-musl-open64-mmap64.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Note that musl uses
-
-#define open64 open
-
-in <fcntl.h> and
-
-#define mmap64 mmap
-
-in <sys/mman.h>. These break with the following attempt to wrap the libc
-function. Its (hopefully?) safe to remove them because of the musl defines.
-
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c
v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c
---- v4l-utils-1.6.2.orig/lib/libv4l1/v4l1compat.c 2013-06-28
20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4l1/v4l1compat.c 2015-07-18 14:44:18.140280932
+0000
-@@ -62,28 +62,6 @@
- return fd;
- }
-
--#ifdef linux
--LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
--{
-- int fd;
--
-- if (oflag & O_CREAT) {
-- va_list ap;
-- mode_t mode;
--
-- va_start(ap, oflag);
-- mode = va_arg(ap, mode_t);
--
-- fd = v4l1_open(file, oflag | O_LARGEFILE, mode);
--
-- va_end(ap);
-- } else
-- fd = v4l1_open(file, oflag | O_LARGEFILE);
--
-- return fd;
--}
--#endif
--
- LIBV4L_PUBLIC int close(int fd)
- {
- return v4l1_close(fd);
-@@ -117,14 +95,6 @@
- return v4l1_mmap(start, length, prot, flags, fd, offset);
- }
-
--#ifdef linux
--LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
int fd,
-- __off64_t offset)
--{
-- return v4l1_mmap(start, length, prot, flags, fd, offset);
--}
--#endif
--
- LIBV4L_PUBLIC int munmap(void *start, size_t length)
- {
- return v4l1_munmap(start, length);
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c
v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c
---- v4l-utils-1.6.2.orig/lib/libv4l2/v4l2convert.c 2013-06-28
20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4l2/v4l2convert.c 2015-07-18 14:44:03.728281474
+0000
-@@ -86,31 +86,6 @@
- return fd;
- }
-
--#ifdef linux
--LIBV4L_PUBLIC int open64(const char *file, int oflag, ...)
--{
-- int fd;
--
-- /* original open code */
-- if (oflag & O_CREAT) {
-- va_list ap;
-- mode_t mode;
--
-- va_start(ap, oflag);
-- mode = va_arg(ap, PROMOTED_MODE_T);
--
-- fd = open(file, oflag | O_LARGEFILE, mode);
--
-- va_end(ap);
-- } else {
-- fd = open(file, oflag | O_LARGEFILE);
-- }
-- /* end of original open code */
--
-- return fd;
--}
--#endif
--
- LIBV4L_PUBLIC int close(int fd)
- {
- return v4l2_close(fd);
-@@ -144,14 +119,6 @@
- return v4l2_mmap(start, length, prot, flags, fd, offset);
- }
-
--#ifdef linux
--LIBV4L_PUBLIC void *mmap64(void *start, size_t length, int prot, int flags,
int fd,
-- __off64_t offset)
--{
-- return v4l2_mmap(start, length, prot, flags, fd, offset);
--}
--#endif
--
- LIBV4L_PUBLIC int munmap(void *start, size_t length)
- {
- return v4l2_munmap(start, length);
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
b/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
deleted file mode 100644
index 03667a2..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-off_t.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h
v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h
---- v4l-utils-1.6.2.orig/lib/libv4lconvert/libv4lsyscall-priv.h
2013-06-28 20:10:56.000000000 +0000
-+++ v4l-utils-1.6.2/lib/libv4lconvert/libv4lsyscall-priv.h 2015-07-18
13:41:01.904423751 +0000
-@@ -59,7 +59,12 @@
- #define _IOC_SIZE(cmd) IOCPARM_LEN(cmd)
- #define MAP_ANONYMOUS MAP_ANON
- #define MMAP2_PAGE_SHIFT 0
-+#endif
-+
-+#if !defined(__GLIBC__) && !defined(__UCLIBC__)
-+#include <sys/types.h>
- typedef off_t __off_t;
-+typedef off64_t __off64_t;
- #endif
-
- #undef SYS_OPEN
diff --git a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
deleted file mode 100644
index db49740..0000000
--- a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Mon, 14 Mar 2016 16:56:40 -0400
-Subject: [PATCH] include sys/sysmacros.h for major() & minor()
-
-Linux C libraries are looking to disentangle sysmacros.h from the
-sys/types.h header to clean up namespace pollution. Since these
-macros are provided in glibc/etc... today, switch to pulling in
-this header directly.
-
-Signed-off-by: Mike Frysinger <[email protected]>
----
- contrib/test/mc_nextgen_test.c | 1 +
- lib/libv4lconvert/control/libv4lcontrol.c | 1 +
- utils/libmedia_dev/get_media_devices.c | 1 +
- utils/media-ctl/libmediactl.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/lib/libv4lconvert/control/libv4lcontrol.c
b/lib/libv4lconvert/control/libv4lcontrol.c
-index 3c8335c..59f28b1 100644
---- a/lib/libv4lconvert/control/libv4lcontrol.c
-+++ b/lib/libv4lconvert/control/libv4lcontrol.c
-@@ -20,6 +20,7 @@
- */
-
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-diff --git a/utils/libmedia_dev/get_media_devices.c
b/utils/libmedia_dev/get_media_devices.c
-index e3a2200..edfeb41 100644
---- a/utils/libmedia_dev/get_media_devices.c
-+++ b/utils/libmedia_dev/get_media_devices.c
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/stat.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/utils/media-ctl/libmediactl.c b/utils/media-ctl/libmediactl.c
-index 4a82d24..16dddbe 100644
---- a/utils/media-ctl/libmediactl.c
-+++ b/utils/media-ctl/libmediactl.c
-@@ -24,6 +24,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
-
- #include <ctype.h>
- #include <errno.h>
---
-2.6.2
-
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild
b/media-libs/libv4l/libv4l-1.6.2.ebuild
deleted file mode 100644
index 3e323ff..0000000
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic linux-info multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git";
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2";
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc
x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-# The libraries only link to -ljpeg, therefore multilib depend only for
virtual/jpeg.
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
- epatch "${FILESDIR}"/${P}-off_t.patch
- epatch "${FILESDIR}"/${P}-musl-open64-mmap64.patch
- epatch "${FILESDIR}"/${P}-musl-ioctl.patch
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # Hard disable the flags that apply only to the utils.
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --without-libudev \
- $(use_with jpeg)
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
deleted file mode 100644
index e0bdc27..0000000
--- a/media-libs/libv4l/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>[email protected]</email>
- <name>Alexandre Rostovtsev</name>
- </maintainer>
- <longdescription lang="en">
- libv4l is a collection of libraries which adds a thin abstraction layer
on
- top of video4linux2 devices. The purpose of this (thin) layer is to
make it
- easy for application writers to support a wide variety of devices
without
- having to write separate code for different devices in the same class.
-
- libv4l consists of 3 different libraries: libv4lconvert, libv4l1 and
libv4l2.
-
- libv4lconvert offers functions to convert from any (known) pixelformat
- to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420.
-
- libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices,
independent
- of the drivers for those devices supporting v4l1 compatibility (which
many
- v4l2 drivers do not).
-
- libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
- application transparent libv4lconvert conversion where necessary.
- </longdescription>
-</pkgmetadata>
