Date: Sunday, December 10, 2017 @ 03:24:33 Author: heftig Revision: 311998
1.12.4-1 Modified: gst-plugins-good/trunk/PKGBUILD Deleted: gst-plugins-good/trunk/0001-tests-souphttpsrc-Update-test-cert.pem.patch gst-plugins-good/trunk/0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch ------------------------------------------------------------+ 0001-tests-souphttpsrc-Update-test-cert.pem.patch | 58 --------- 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch | 70 ----------- PKGBUILD | 20 --- 3 files changed, 5 insertions(+), 143 deletions(-) Deleted: 0001-tests-souphttpsrc-Update-test-cert.pem.patch =================================================================== --- 0001-tests-souphttpsrc-Update-test-cert.pem.patch 2017-12-10 03:22:27 UTC (rev 311997) +++ 0001-tests-souphttpsrc-Update-test-cert.pem.patch 2017-12-10 03:24:33 UTC (rev 311998) @@ -1,58 +0,0 @@ -From 5166461059402fb0a7130fdc100e96698b1f90b7 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Tue, 20 Jun 2017 16:28:35 +0200 -Subject: [PATCH 1/4] tests: souphttpsrc: Update test-cert.pem - -Recent GnuTLS disregards the Common Name and only looks at the Subject -Alternative Name extension. Since our test-cert has no SAN extension, -validation fails. - -Generate a new certificate with SAN. In addition to 127.0.0.1, for good -measure make it valid for localhost and ::1, too. - -https://bugzilla.gnome.org/show_bug.cgi?id=784005 ---- - tests/files/test-cert.pem | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/tests/files/test-cert.pem b/tests/files/test-cert.pem -index 7f2062665529424e..ff863b4d1387270f 100644 ---- a/tests/files/test-cert.pem -+++ b/tests/files/test-cert.pem -@@ -1,17 +1,18 @@ - -----BEGIN CERTIFICATE----- --MIICpDCCAYwCCQC8Suc8hjfgujANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDDAkx --MjcuMC4wLjEwHhcNMTEwOTE5MTkyMjA1WhcNMjEwOTE2MTkyMjA1WjAUMRIwEAYD --VQQDDAkxMjcuMC4wLjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr --OH7kblu+5zkYTk/ZG21OgbIyltxhLDHPmUpl4yDUFqX5BEtoVfg0Ms4ZuaoeDi4t --b2LV6Em3UDQwmwPMm2SakfJvRd3nfL6G3UkkBsVqT3V04M9u8fk6YgHPT8PN1Lj7 --5bv9AMRyQRV1QIPondMhbt8JhlmCR6ALbxYtsXkbQF7qzbj7Y2cjvoHzPQSk0QpB --rEUpj6Schm1NkPen48Z1X1faGL0F3roFHEsf6U1AjP5A4A/UGQsRtq35VzVnKgxW --N7jumUevEMIvyqLjmvK864AHMIRVCOls9GcIta80bViuVqgtuGgVGM/7SoZfIvPF --A10jIe7KQoXWAwRi4WclAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJfihY634dRr --DeEA4SQ1e0/kB6EF8oeaC+5EuGOJxtoX+yXJfWJsEtmjRwobyOBVV997hdOtdZjo --mdJOCKerOFKccO9PLNJZ+/l4+NHv9OwOcu4UqvrSsps/pmr/22SIyQswbLLJfPAT --KjGTDLlj//zrLxzUGsu7lgGsY4s4fVbftFZv7P5AyErpwiFk8qM1BP0NMkn4XWSA --uSyTeB6O+tWYdh3bA1BeKC2P85sl6xFJI2gxvNTxtdcg9beDqNuEheJ+mEtD3P4w --HDG1vFaAX0MH1RJSDO/dIoJerN6LTjiTYYYg8yV0lmBxijv25Z/3Gi33OuG9jkdR --vXDwJpC+/ko= -+MIIC2zCCAcOgAwIBAgIJALRbg2WnuAAqMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV -+BAMMCTEyNy4wLjAuMTAeFw0xNzA2MjAxNDI3MzBaFw0yNzA2MTgxNDI3MzBaMBQx -+EjAQBgNVBAMMCTEyNy4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -+ggEBAKs4fuRuW77nORhOT9kbbU6BsjKW3GEsMc+ZSmXjINQWpfkES2hV+DQyzhm5 -+qh4OLi1vYtXoSbdQNDCbA8ybZJqR8m9F3ed8vobdSSQGxWpPdXTgz27x+TpiAc9P -+w83UuPvlu/0AxHJBFXVAg+id0yFu3wmGWYJHoAtvFi2xeRtAXurNuPtjZyO+gfM9 -+BKTRCkGsRSmPpJyGbU2Q96fjxnVfV9oYvQXeugUcSx/pTUCM/kDgD9QZCxG2rflX -+NWcqDFY3uO6ZR68Qwi/KouOa8rzrgAcwhFUI6Wz0Zwi1rzRtWK5WqC24aBUYz/tK -+hl8i88UDXSMh7spChdYDBGLhZyUCAwEAAaMwMC4wLAYDVR0RBCUwI4IJbG9jYWxo -+b3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBAQBj -++U8tebwg5/pof5Rht6TMHqeg6Fcr4OJkL2ph2g+T/AMTS7kEGeFIKJN5AZ+S/qIY -+cdoDKHwc8+bCK/mG6DPmJ4z/2Eamb85YhplOLVrLRwfxRebTK9CtnjcjnflAiU9H -+7vPVwXIvkwebhBSQNKTdkBlPXKaTNWXuygeFG2OVQkPf/KAxSdtg2R+owv/s802Z -+HISk26wY9oFIQz6AiXWdrY1QqNOltZ7rlU5iofAH7X+9ryZlxPWj/gHg2YQRvvLl -+dq6nCF+ED0ke7h0lg5nU0beKEygwli8DlLVbu0JK0PkARFp5t7wUtzC9DCjzvfOc -+gxR44PyZX7/2oaTDm4PS - -----END CERTIFICATE----- --- -2.13.1 - Deleted: 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch =================================================================== --- 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch 2017-12-10 03:22:27 UTC (rev 311997) +++ 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch 2017-12-10 03:24:33 UTC (rev 311998) @@ -1,70 +0,0 @@ -From b7e908d32e7cd051d77b8b95174d48f07d2a737d Mon Sep 17 00:00:00 2001 -Message-Id: <b7e908d32e7cd051d77b8b95174d48f07d2a737d.1508414658.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Thu, 19 Oct 2017 14:02:37 +0200 -Subject: [PATCH] v4l2deviceprovider: Ignore touch sensing devices - -My laptop's touchpad shows up as a video source device in -gst-device-monitor, but attempting to stream from it fails because the -device doesn't actually support any video formats. - -name : Synaptics RMI4 Touch Sensor -class : Video/Source -caps : video/x-raw, format=(string)I420, framerate=(fraction)[ 0/1, 2147483647/1 ], width=(int)0, height=(int)0, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1; - video/x-raw, format=(string)YV12, framerate=(fraction)[ 0/1, 2147483647/1 ], width=(int)0, height=(int)0, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1; - video/x-raw, format=(string)BGR, framerate=(fraction)[ 0/1, 2147483647/1 ], width=(int)0, height=(int)0, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1; - video/x-raw, format=(string)RGB, framerate=(fraction)[ 0/1, 2147483647/1 ], width=(int)0, height=(int)0, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1; -properties: - udev-probed = true - device.bus_path = /sys/devices/rmi4-00/rmi4-00.fn54/video4linux/v4l-touch0 - sysfs.path = /sys/devices/rmi4-00/rmi4-00.fn54/video4linux/v4l-touch0 - device.subsystem = video4linux - device.product.name = "Synaptics\ RMI4\ Touch\ Sensor" - device.capabilities = :capture: - device.api = v4l2 - device.path = /dev/v4l-touch0 - v4l2.device.driver = rmi4_f54 - v4l2.device.card = "Synaptics\ RMI4\ Touch\ Sensor" - v4l2.device.bus_info = rmi4:rmi4-00.fn54 - v4l2.device.version = 265480 (0x00040d08) - v4l2.device.capabilities = 2501902337 (0x95200001) - v4l2.device.device_caps = 354418689 (0x15200001) -gst-launch-1.0 v4l2src device=/dev/v4l-touch0 ! ... ---- - sys/v4l2/gstv4l2deviceprovider.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/sys/v4l2/gstv4l2deviceprovider.c b/sys/v4l2/gstv4l2deviceprovider.c -index 4b003e721692875f..549979e22845de0b 100644 ---- a/sys/v4l2/gstv4l2deviceprovider.c -+++ b/sys/v4l2/gstv4l2deviceprovider.c -@@ -37,6 +37,11 @@ - #include <gudev/gudev.h> - #endif - -+/* Only available since Linux 4.8 */ -+#ifndef V4L2_CAP_TOUCH -+#define V4L2_CAP_TOUCH 0x10000000 -+#endif -+ - static GstV4l2Device *gst_v4l2_device_new (const gchar * device_path, - const gchar * device_name, GstCaps * caps, GstV4l2DeviceType type, - GstStructure * props); -@@ -136,8 +141,13 @@ gst_v4l2_device_provider_probe_device (GstV4l2DeviceProvider * provider, - v4l2obj->vcap.device_caps, NULL); - - if (v4l2obj->device_caps & -- (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_CAPTURE_MPLANE)) -+ (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_CAPTURE_MPLANE)) { -+ /* We ignore touch sensing devices; those are't really video */ -+ if (v4l2obj->device_caps & V4L2_CAP_TOUCH) -+ goto close; -+ - type = GST_V4L2_DEVICE_TYPE_SOURCE; -+ } - - if (v4l2obj->device_caps & - (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE)) { --- -2.14.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-10 03:22:27 UTC (rev 311997) +++ PKGBUILD 2017-12-10 03:24:33 UTC (rev 311998) @@ -3,8 +3,8 @@ # Contributor: Jan de Groot <[email protected]> pkgname=gst-plugins-good -pkgver=1.12.3 -pkgrel=2 +pkgver=1.12.4 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" url="https://gstreamer.freedesktop.org/"; arch=(x86_64) @@ -14,15 +14,11 @@ libraw1394) makedepends=(python gtk-doc autoconf-archive git) checkdepends=(gst-plugins-base) -_commit=4ce0249911fb4dda1a7e643a91490a10f2a6d415 # tags/1.12.3^0 +_commit=224938300a3b0fd8263422c3548576ac939032e5 # tags/1.12.4^0 source=("git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good#commit=$_commit"; - "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common"; - 0001-tests-souphttpsrc-Update-test-cert.pem.patch - 0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch) + "gst-common::git+https://anongit.freedesktop.org/git/gstreamer/common";) sha256sums=('SKIP' - 'SKIP' - 'c8ebf17293c7c2a623cc40339b5619d3496e49a41229780f113ea84ce83c1e60' - '7c992ae42698144be8769c276fb0e796e61400532839e6c803dc69a4dbec2d5d') + 'SKIP') pkgver() { cd $pkgname @@ -32,12 +28,6 @@ prepare() { cd $pkgname - # https://bugzilla.gnome.org/show_bug.cgi?id=784005 - patch -Np1 -i ../0001-tests-souphttpsrc-Update-test-cert.pem.patch - - # https://bugzilla.gnome.org/show_bug.cgi?id=789197 - patch -Np1 -i ../0001-v4l2deviceprovider-Ignore-touch-sensing-devices.patch - git submodule init git config --local submodule.common.url "$srcdir/gst-common" git submodule update
