commit: 017558f6fe26e9d1494deb873c3c356ec9848418 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Thu Feb 23 01:35:46 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Thu Feb 23 01:35:46 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=017558f6
media-libs/libv4l: sync with tree drop r99 suffix media-libs/libv4l/Manifest | 3 +- .../libv4l/files/libv4l-1.6.2-sysmacros.patch | 57 ++++++++++++++++++++++ ...libv4l-1.6.2-r99.ebuild => libv4l-1.6.2.ebuild} | 5 +- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest index c6333d1..84079d3 100644 --- a/media-libs/libv4l/Manifest +++ b/media-libs/libv4l/Manifest @@ -1,6 +1,7 @@ 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-r99.ebuild 1562 SHA256 aed3438607a3c010c325821c245584e15f40aebef546dedb9664c34a2968cab2 SHA512 812e22ca11457d6b1d9e584d7833b096834e408353924375c81af1b0c39a0548912338255653479a4f96eb31a6ac768efd84eda52176e0e8f7f80ce7d97dfaae WHIRLPOOL bf64626940c17e187d30885f8ae0306bc17da473007010e6cbee729a9f3e097d45308c719db8a437bab1947d80ba038581156142e4eaca55cb53e983c1a03f41 +EBUILD libv4l-1.6.2.ebuild 1676 SHA256 61cd868851d9a22b5c27cf29da8d12533098cb0dad176a28c9d29ebe734263f4 SHA512 ed1e5aeb7e8d17eec5061b6bff5bed040e672264302add86ae2d373e924487d69e0ca6cf6e3f576607732e0ff4c37a8dbd9198af80c76f3460a747e1aacaecc7 WHIRLPOOL d773dc6c1af251ad77391cb391ba509b26f2e7deac39a3a69f1002d29f87ec03b54eb3fdca8cfe1db170fa085b41625aebde862f52b7652765925aab6ea433cb MISC metadata.xml 1125 SHA256 1be1fac7b283729b4f1ebc9f53d12d21c6fe65839e7981794633ef8072209558 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7 WHIRLPOOL e777f9b89fcb3b6626b5ca250606186f60b1f7433ccd3ccbad08fcff88d3b9b66a1ce41a7cca2684e926aa66fb180f29c3be4705e5c4bc893b3a019854213bd4 diff --git a/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch new file mode 100644 index 0000000..db49740 --- /dev/null +++ b/media-libs/libv4l/files/libv4l-1.6.2-sysmacros.patch @@ -0,0 +1,57 @@ +From 8edd80d3654843d9441fb5e43dfbf2b3e81f84b5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vap...@gentoo.org> +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 <vap...@gentoo.org> +--- + 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-r99.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild similarity index 88% rename from media-libs/libv4l/libv4l-1.6.2-r99.ebuild rename to media-libs/libv4l/libv4l-1.6.2.ebuild index 187a0dc..1a26783 100644 --- a/media-libs/libv4l/libv4l-1.6.2-r99.ebuild +++ b/media-libs/libv4l/libv4l-1.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"; LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" +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. @@ -37,6 +37,7 @@ 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
