New upstream release 1.10.1
Fix FTBFS (rhbz#1402087)
This commit is contained in:
Hans de Goede
parent
fd96c57a73
commit
7fb00df7db
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@
|
||||
/v4l-utils-1.6.2.tar.bz2
|
||||
/v4l-utils-1.8.1.tar.bz2
|
||||
/v4l-utils-1.10.0.tar.bz2
|
||||
/v4l-utils-1.10.1.tar.bz2
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
From f42ea9e3543037e0b799f174534f268dea98fce0 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Sat, 27 Feb 2016 14:32:07 +0100
|
||||
Subject: [PATCH] v4lconvert: Add "PEGATRON CORPORATION" to asus_board_vendor
|
||||
|
||||
Some Asus laptops actually have "PEGATRON CORPORATION" in board_vendor,
|
||||
add this to the list of strings used to recognize Asus as vendor.
|
||||
|
||||
This also allows us to remove a bunch of PEGATRON entries from the static
|
||||
v4lcontrol_flags table.
|
||||
|
||||
Note that 2 PEGATRON entries remain in the static v4lcontrol_flags table,
|
||||
one for a "H54" board_name entry since "H54" is not in the asus_board_name
|
||||
array, and one "PEGATRON CORP." board which does not have a usable
|
||||
board_name at all.
|
||||
|
||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1311545
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
lib/libv4lconvert/control/libv4lcontrol.c | 10 +---------
|
||||
1 file changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
index e1832a9..0c45a26 100644
|
||||
--- a/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
+++ b/lib/libv4lconvert/control/libv4lcontrol.c
|
||||
@@ -75,9 +75,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = {
|
||||
/* A re-branded ASUS notebook */
|
||||
{ 0x04f2, 0xb012, 0, "Founder PC", "T14MF",
|
||||
V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
- /* Note no whitespace padding for board vendor, this is not a typo */
|
||||
- { 0x04f2, 0xb012, 0, "PEGATRON CORPORATION", "X71TL ",
|
||||
- V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
/* These 3 PACKARD BELL's seem to be Asus notebook in disguise */
|
||||
{ 0x04f2, 0xb012, 0, "Packard Bell BV", "T32A ",
|
||||
V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
@@ -152,10 +149,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = {
|
||||
{ 0x064e, 0xa111, 0, "Acer, Inc.", "Prespa1 ",
|
||||
V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0,
|
||||
"Acer, inc.", "Aspire 5570 " },
|
||||
- { 0x064e, 0xa111, 0, "PEGATRON CORPORATION ", "F5C ",
|
||||
- V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
- { 0x064e, 0xa111, 0, "PEGATRON CORPORATION ", "F5SR ",
|
||||
- V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
/* 2 reports:
|
||||
Unknown laptop model -> System Vendor: " IDEALMAX"
|
||||
Síragon SL-6120 -> System Vendor: "PEGA PC"
|
||||
@@ -165,8 +158,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = {
|
||||
NULL, "H34" },
|
||||
{ 0x064e, 0xa212, 0, "MEDIONAG", "WeTab ",
|
||||
V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
- { 0x174f, 0x5a35, 0, "PEGATRON CORPORATION ", "F5SL ",
|
||||
- V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED },
|
||||
{ 0x174f, 0x6a51, 0, NULL, "S96S",
|
||||
V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0,
|
||||
"MicroLink", "S96S" },
|
||||
@@ -270,6 +261,7 @@ static const char *asus_board_vendor[] = {
|
||||
"ASUSTeK Computer Inc.",
|
||||
"ASUSTeK Computer INC.",
|
||||
"ASUS CORPORATION",
|
||||
+ "PEGATRON CORPORATION",
|
||||
NULL };
|
||||
|
||||
static const char *asus_board_name[] = {
|
||||
--
|
||||
2.7.1
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
945a38979138997e805828a4a53e53ec v4l-utils-1.10.0.tar.bz2
|
||||
SHA512 (v4l-utils-1.10.1.tar.bz2) = 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
Name: v4l-utils
|
||||
Version: 1.10.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.10.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Utilities for video4linux and DVB devices
|
||||
Group: Applications/System
|
||||
# libdvbv5, dvbv5 utils, ir-keytable and v4l2-sysfs-path are GPLv2 only
|
||||
License: GPLv2+ and GPLv2
|
||||
URL: http://www.linuxtv.org/downloads/v4l-utils/
|
||||
Source0: http://linuxtv.org/downloads/v4l-utils/v4l-utils-%{version}.tar.bz2
|
||||
Patch1: 0001-v4lconvert-Add-PEGATRON-CORPORATION-to-asus_board_ve.patch
|
||||
BuildRequires: libjpeg-devel qt5-qtbase-devel kernel-headers desktop-file-utils
|
||||
BuildRequires: alsa-lib-devel doxygen gettext
|
||||
# For /lib/udev/rules.d ownership
|
||||
@ -98,7 +97,6 @@ files for developing applications that use libdvbv5.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
|
||||
|
||||
%build
|
||||
@ -201,6 +199,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 15 2016 Hans de Goede <hdegoede@redhat.com> - 1.10.1-1
|
||||
- New upstream release 1.10.1
|
||||
- Fix FTBFS (rhbz#1402087)
|
||||
|
||||
* Tue Mar 1 2016 Hans de Goede <hdegoede@redhat.com> - 1.10.0-2
|
||||
- Update upside down table to apply to PEGATRON laptops (rhbz#1311545)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user