Skip to contentSkip to conversation

ffmpeg: update to 3.3

PATCH In review Alexander Kanavin 3 participants 15 messages May 10, 2017 – May 18, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 ffmpeg: update to 3.3

--enabled-x11grab option has been removed upstream (and it was described as 'legacy' in the previous version)

---
 meta/recipes-multimedia/ffmpeg/{ffmpeg_3.2.4.bb => ffmpeg_3.3.bb} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-multimedia/ffmpeg/{ffmpeg_3.2.4.bb => ffmpeg_3.3.bb} (95%)
meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.bb renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb +3 -4
similarity index 95%
rename from meta/recipes-multimedia/ffmpeg/ffmpeg_3.2.4.bb
rename to meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.bb
index 3216f8eb00e..c2b570e85cf 100644
@@ -26,8 +26,8 @@ LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
            file://mips64_cpu_detection.patch \
           "
-SRC_URI[md5sum] = "39fd71024ac76ba35f04397021af5606"
-SRC_URI[sha256sum] = "6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a"
+SRC_URI[md5sum] = "368f1fff4bdadaf2823934cc0aadd71d"
+SRC_URI[sha256sum] = "599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d"
 
 # Build fails when thumb is enabled: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7717
 ARM_INSTRUCTION_SET = "arm"
@@ -42,7 +42,7 @@ inherit autotools pkgconfig
 
 PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc \
                    bzlib gpl lzma theora x264 \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xv', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv', '', d)}"
 
 # libraries to build in addition to avutil
 PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
@@ -69,7 +69,6 @@ PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
 PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
 PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
 PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
-PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
 PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
 PACKAGECONFIG[xv] = "--enable-outdev=xv,--disable-outdev=xv,libxv"
 
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/11 trace-cmd: update to 2.6.1

License change is due to update in FSF address.

Library path needs to be specified in absolute form now.

Remove bash completion file from kernelshark package as it will cause a conflict with trace-cmd package.

---
 meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 3 ++-
 meta/recipes-kernel/trace-cmd/trace-cmd.inc      | 4 ++--
 meta/recipes-kernel/trace-cmd/trace-cmd_git.bb   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
meta/recipes-kernel/trace-cmd/kernelshark_git.bb +2 -1
index 563182c89fe..9a5e8006c78 100644
@@ -15,7 +15,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
 EXTRA_OEMAKE = "\
     'prefix=${prefix}' \
     'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
-    'libdir=${@oe.path.relative(prefix, libdir)}' \
+    'libdir=${libdir}' \
     NO_PYTHON=1 \
     gui \
 "
@@ -28,5 +28,6 @@ do_install() {
     oe_runmake DESTDIR="${D}" install_gui
     rm ${D}${bindir}/trace-cmd
     rm -rf ${D}${libdir}/trace-cmd
+    rm -rf ${D}${sysconfdir}/bash_completion.d/trace-cmd.bash
     rmdir ${D}${libdir}
 }
meta/recipes-kernel/trace-cmd/trace-cmd.inc +2 -2
index 3ad06fad81b..e0f6c3fba56 100644
@@ -1,5 +1,5 @@
-SRCREV = "9be5d74805830a291615f2f34a27c903f6a37b1e"
-PV = "2.6"
+SRCREV = "021710e1073fe203341b427cd1a4bac577ec899c"
+PV = "2.6.1"
 
 inherit pkgconfig
 
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +2 -2
index dd9a8a0ded6..fa9ffa3dc8f 100644
@@ -5,7 +5,7 @@ require trace-cmd.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
-                    file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
+                    file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \
                     file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
 "
 
@@ -17,7 +17,7 @@ EXTRA_OEMAKE = "\
     'img_install=${datadir}/kernelshark/html/images' \
     \
     'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
-    'libdir=${@oe.path.relative(prefix, libdir)}' \
+    'libdir=${libdir}' \
     \
     NO_PYTHON=1 \
 "
Signature · 1 line
2.11.0
#3 lore raw

PATCH 3/11 mpg123: update to 1.24.0

In reply to Alexander Kanavin

--with-module-suffix has been removed upstream.

---
 .../recipes-multimedia/mpg123/{mpg123_1.23.8.bb => mpg123_1.24.0.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.23.8.bb => mpg123_1.24.0.bb} (93%)
meta/recipes-multimedia/mpg123/mpg123_1.24.0.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb +2 -3
similarity index 93%
rename from meta/recipes-multimedia/mpg123/mpg123_1.23.8.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.24.0.bb
index e0a70380ea7..587327b9ef0 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "4dde045123a2ad1e385a0a82c0ef9268"
-SRC_URI[sha256sum] = "de2303c8ecb65593e39815c0a2f2f2d91f708c43b85a55fdd1934c82e677cf8e"
+SRC_URI[md5sum] = "75d62ac0cb713a7bac5af4ded4af2bb4"
+SRC_URI[sha256sum] = "55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c"
 
 inherit autotools pkgconfig
 
@@ -39,7 +39,6 @@ AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d
 EXTRA_OECONF = " \
     --enable-shared \
     --with-audio='${AUDIOMODS}' \
-    --with-module-suffix=.so \
     ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \
     ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \
 "
Signature · 1 line
2.11.0
#4 lore raw

PATCH 4/11 sysprof: update to 3.24.1

In reply to Alexander Kanavin
---
 .../sysprof/{sysprof_3.22.3.bb => sysprof_3.24.1.bb}           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/sysprof/{sysprof_3.22.3.bb => sysprof_3.24.1.bb} (73%)
meta/recipes-kernel/sysprof/sysprof_3.24.1.bb renamed from meta/recipes-kernel/sysprof/sysprof_3.22.3.bb +7 -3
similarity index 73%
rename from meta/recipes-kernel/sysprof/sysprof_3.22.3.bb
rename to meta/recipes-kernel/sysprof/sysprof_3.24.1.bb
index 26310634c64..ca3589bcc97 100644
@@ -13,20 +13,24 @@ SRC_URI += " \
            file://0001-Disable-check-for-polkit-for-UI.patch \
            file://0001-Avoid-building-docs.patch \
           "
-SRC_URI[archive.sha256sum] = "e6dca325b3014440f457a92db18ffe342a35888db3f0756694a99b9652796367"
-SRC_URI[archive.md5sum] = "9514065dc752105240e5567c13708af4"
+SRC_URI[archive.md5sum] = "2b44ae1d8cd899417294a9c4509d7870"
+SRC_URI[archive.sha256sum] = "054eebe2afb6fe3c06ac8c46bc045c42f675d4fd64e6f16cbc602d5c7ce27bec"
 
 AUTOTOOLS_AUXDIR = "${S}/build-aux"
 
 EXTRA_OECONF = "--enable-compile-warnings"
 
+# This properly relocates msgfmt, which otherwise fails to find its data files. 
+# Tips on how to get rid of hardcoded version welcome.
+export GETTEXTDATADIR = "${STAGING_DATADIR_NATIVE}/gettext-0.19.8/"
+
 PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"
 PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
 PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus"
 
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "${datadir}/icons/"
+FILES_${PN} += "${datadir}/icons/ ${datadir}/appdata"
 
 SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}"
 
Signature · 1 line
2.11.0
#5 lore raw

Re: [PATCH 04/11] sysprof: update to 3.24.1

Quoted 2 lines · Alexander Kanavin

+FILES_${PN} += "${datadir}/icons/ ${datadir}/appdata"

We're going to see this more often, so it's probably worth adding appdata to gnomebase.bbclass.

Ross

#6 lore raw

PATCH 5/11 gdbm: update to 1.13

In reply to Alexander Kanavin

Rebase ptest.patch.

---
 meta/recipes-support/gdbm/files/ptest.patch        | 40 +++++++++++++++-------
 .../gdbm/{gdbm_1.12.bb => gdbm_1.13.bb}            |  4 +--
 2 files changed, 29 insertions(+), 15 deletions(-)
 rename meta/recipes-support/gdbm/{gdbm_1.12.bb => gdbm_1.13.bb} (88%)
meta/recipes-support/gdbm/files/ptest.patch +27 -13
index 65236fb48b1..b9461bec6b3 100644
@@ -1,30 +1,41 @@
-Add install-ptest rules.
+From 4e4b70a4a3dcf1fdbee9e68bed3b62f42b197a3a Mon Sep 17 00:00:00 2001
+From: Josep Puigdemont <[email protected]>
+Date: Sun, 4 May 2014 16:02:07 +0200
+Subject: [PATCH] Add install-ptest rules.
 
 Signed-off-by: Josep Puigdemont <[email protected]>
 Signed-off-by: Maxin B. John <[email protected]>
 Upstream-Status: Pending
 
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2011-08-16 10:13:10.000000000 +0200
-+++ b/Makefile.am	2013-04-12 18:02:16.473715873 +0200
-@@ -31,3 +31,8 @@
- 	d=`date '+%d/%m/%Y'`; \
- 	sed 's|/\*@DIST_DATE@\*/|"'"$$d"'"|' $(srcdir)/src/version.c > \
- 		$(distdir)/src/version.c
+---
+ Makefile.am       |  5 +++++
+ tests/Makefile.am | 12 +++++++++++-
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4cdc734..24b99f0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -45,3 +45,8 @@ ChangeLog:
+                 awk -f $(top_srcdir)/git2chg.awk                            \
+                     -v append=$(top_srcdir)/$(prev_change_log) > ChangeLog; \
+         fi
 +
 +install-ptest:
 +	@for subdir in $(SUBDIRS); do \
 +		$(MAKE) -C $$subdir DESTDIR=$(DESTDIR)/$$subdir $@; \
 +	done
-diff -ur a/tests/Makefile.am b/tests/Makefile.am
---- a/tests/Makefile.am	2011-11-11 19:39:42.000000000 +0100
-+++ b/tests/Makefile.am	2013-04-12 18:30:57.066301037 +0200
-@@ -132,4 +132,14 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 3dbb580..22ffc44 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -130,4 +130,14 @@ dtfetch_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
  dtdel_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
  d_creat_ce_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la
  
+-
 +buildtests: $(check_PROGRAMS) $(TESTSUITE)
- 
++
 +install-ptest: $(check_PROGRAMS) $(TESTSUITE)
 +	@$(INSTALL) -d $(DESTDIR)
 +	@for file in $^; do \
@@ -34,3 +45,6 @@ diff -ur a/tests/Makefile.am b/tests/Makefile.am
 +			$(INSTALL_PROGRAM) $$file $(DESTDIR) ; \
 +		fi \
 +	done
+-- 
+2.11.0
+
meta/recipes-support/gdbm/gdbm_1.13.bb renamed from meta/recipes-support/gdbm/gdbm_1.12.bb +2 -2
similarity index 88%
rename from meta/recipes-support/gdbm/gdbm_1.12.bb
rename to meta/recipes-support/gdbm/gdbm_1.13.bb
index c380073c359..4bbe147df5c 100644
@@ -10,8 +10,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
            file://ptest.patch \
           "
 
-SRC_URI[md5sum] = "9ce96ff4c99e74295ea19040931c8fb9"
-SRC_URI[sha256sum] = "d97b2166ee867fd6ca5c022efee80702d6f30dd66af0e03ed092285c3af9bcea"
+SRC_URI[md5sum] = "8929dcda2a8de3fd2367bdbf66769376"
+SRC_URI[sha256sum] = "9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253"
 
 inherit autotools gettext texinfo lib_package ptest
 
Signature · 1 line
2.11.0
#7 lore raw

PATCH 6/11 gnome-desktop3: update to 3.24.2

In reply to Alexander Kanavin
---
 .../{gnome-desktop3_3.22.2.bb => gnome-desktop3_3.24.2.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.22.2.bb => gnome-desktop3_3.24.2.bb} (85%)
meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb renamed from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.22.2.bb +2 -2
similarity index 85%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.22.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
index e72c6ce42d2..24d23bad0e2 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 BPN = "gnome-desktop"
 
 inherit gnome pkgconfig upstream-version-is-even gobject-introspection
-SRC_URI[archive.md5sum] = "3d7222d5305f3db022eca31d8108e02d"
-SRC_URI[archive.sha256sum] = "51d7ebf7a6c359be14c3dd7a022213e931484653815eb10b0131bef4c8979e1c"
+SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93"
+SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"
 
 SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch"
 
Signature · 1 line
2.11.0
#8 lore raw

PATCH 7/11 ed: update to 1.14.2

In reply to Alexander Kanavin
---
 meta/recipes-extended/ed/{ed_1.14.1.bb => ed_1.14.2.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/ed/{ed_1.14.1.bb => ed_1.14.2.bb} (79%)
meta/recipes-extended/ed/ed_1.14.2.bb renamed from meta/recipes-extended/ed/ed_1.14.1.bb +3 -3
similarity index 79%
rename from meta/recipes-extended/ed/ed_1.14.1.bb
rename to meta/recipes-extended/ed/ed_1.14.2.bb
index 7e6bde450f1..87d03b10b1d 100644
@@ -12,11 +12,11 @@ SECTION = "base"
 bindir = "${base_bindir}"
 
 # Upstream regularly removes previous releases from https://ftp.gnu.org/gnu/ed/
-SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.lz"
+SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz"
 UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
 
-SRC_URI[md5sum] = "7f4a54fa7f366479f03654b8af645fd0"
-SRC_URI[sha256sum] = "ffb97eb8f2a2b5a71a9b97e3872adce953aa1b8958e04c5b7bf11d556f32552a"
+SRC_URI[md5sum] = "273d04778b2a51f7c3cbfcd2001876bf"
+SRC_URI[sha256sum] = "f57962ba930d70d02fc71d6be5c5f2346b16992a455ab9c43be7061dec9810db"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
Signature · 1 line
2.11.0
#9 lore raw

PATCH 8/11 libpciaccess: update to 0.13.5

In reply to Alexander Kanavin

Drop backported patches

---
 ...clude-config.h-before-anything-else-in-.c.patch | 187 ---------------------
 .../libpciaccess/0002-Fix-quoting-issue.patch      |  34 ----
 ...nux_sysfs.c-Include-limits.h-for-PATH_MAX.patch |  32 ----
 ...bpciaccess_0.13.4.bb => libpciaccess_0.13.5.bb} |   7 +-
 4 files changed, 2 insertions(+), 258 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch
 rename meta/recipes-graphics/xorg-lib/{libpciaccess_0.13.4.bb => libpciaccess_0.13.5.bb} (54%)
meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch deleted +0 -187
deleted file mode 100644
index e92fc0d95d4..00000000000
@@ -1,187 +0,0 @@
-From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001
-From: Julien Cristau <[email protected]>
-Date: Sun, 26 Apr 2015 15:20:57 +0200
-Subject: [PATCH 1/4] Include config.h before anything else in *.c
-
-Debian bug#749008 <https://bugs.debian.org/749008>
-
-Reported-by: Michael Tautschnig <[email protected]>
-Signed-off-by: Julien Cristau <[email protected]>
-Reviewed-by: Alan Coopersmith <[email protected]>
----
-Upstream-Status: Backport
-
- src/common_capability.c  | 3 +++
- src/common_init.c        | 3 +++
- src/common_interface.c   | 3 +++
- src/common_io.c          | 3 +++
- src/common_iterator.c    | 3 +++
- src/common_map.c         | 3 +++
- src/common_vgaarb_stub.c | 3 +++
- src/linux_devmem.c       | 5 +++--
- src/openbsd_pci.c        | 3 +++
- src/solx_devfs.c         | 3 +++
- src/x86_pci.c            | 4 +++-
- 11 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/src/common_capability.c b/src/common_capability.c
-index 488743d..15d395d 100644
---- a/src/common_capability.c
-+++ b/src/common_capability.c
-@@ -31,6 +31,9 @@
-  *
-  * \author Ian Romanick <[email protected]>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <stdio.h>
-diff --git a/src/common_init.c b/src/common_init.c
-index b1c0c3e..f7b59bd 100644
---- a/src/common_init.c
-+++ b/src/common_init.c
-@@ -28,6 +28,9 @@
-  *
-  * \author Ian Romanick <[email protected]>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <errno.h>
-diff --git a/src/common_interface.c b/src/common_interface.c
-index 59778cf..cb95e90 100644
---- a/src/common_interface.c
-+++ b/src/common_interface.c
-@@ -28,6 +28,9 @@
-  *
-  * \author Ian Romanick <[email protected]>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/common_io.c b/src/common_io.c
-index f5c9e45..e9586ad 100644
---- a/src/common_io.c
-+++ b/src/common_io.c
-@@ -22,6 +22,9 @@
-  * Author:
-  *	Adam Jackson <[email protected]>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/common_iterator.c b/src/common_iterator.c
-index ccf656d..2beb180 100644
---- a/src/common_iterator.c
-+++ b/src/common_iterator.c
-@@ -28,6 +28,9 @@
-  *
-  * \author Ian Romanick <[email protected]>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/common_map.c b/src/common_map.c
-index 8757151..f1854bb 100644
---- a/src/common_map.c
-+++ b/src/common_map.c
-@@ -21,6 +21,9 @@
-  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  * DEALINGS IN THE SOFTWARE.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <sys/types.h>
- #include <sys/mman.h>
-diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c
-index 9394273..c1708f6 100644
---- a/src/common_vgaarb_stub.c
-+++ b/src/common_vgaarb_stub.c
-@@ -23,6 +23,9 @@
-  * OTHER DEALINGS IN THE SOFTWARE.
-  *
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdio.h>
- #include "pciaccess.h"
-diff --git a/src/linux_devmem.c b/src/linux_devmem.c
-index 10e3bde..0d0567c 100644
---- a/src/linux_devmem.c
-+++ b/src/linux_devmem.c
-@@ -32,8 +32,9 @@
-  *
-  * \author Ian Romanick <[email protected]>
-  */
--
--#define _GNU_SOURCE
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c
-index 4d1b5cd..b8ce318 100644
---- a/src/openbsd_pci.c
-+++ b/src/openbsd_pci.c
-@@ -13,6 +13,9 @@
-  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <sys/param.h>
- #include <sys/ioctl.h>
-diff --git a/src/solx_devfs.c b/src/solx_devfs.c
-index f572393..cf96467 100644
---- a/src/solx_devfs.c
-+++ b/src/solx_devfs.c
-@@ -25,6 +25,9 @@
- /*
-  * Solaris devfs interfaces
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <stdlib.h>
- #include <strings.h>
-diff --git a/src/x86_pci.c b/src/x86_pci.c
-index 49c1cab..32daa04 100644
---- a/src/x86_pci.c
-+++ b/src/x86_pci.c
-@@ -18,8 +18,10 @@
-  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
--#define _GNU_SOURCE
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
--- 
-2.1.4
-
meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch deleted +0 -34
deleted file mode 100644
index 16d69a82a4c..00000000000
@@ -1,34 +0,0 @@
-From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <[email protected]>
-Date: Sun, 22 Mar 2015 21:38:23 +0100
-Subject: [PATCH 2/4] Fix quoting issue.
-
-m4 has '[]' as quoting characters, so if we want '[]' to
-end up in the configure script, we need to quote them again.
-
-Reported by Greg Troxel <[email protected]>.
-
-Signed-off-by: Thomas Klausner <[email protected]>
-Reviewed-by: Alan Coopersmith <[email protected]>
----
-Upstream-Status: Backport
-
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e67e9e1..888330b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ case $host_os in
- 		;;
- 	*netbsd*)
- 		case $host in
--		*i[3-9]86*)
-+		*i[[3-9]]86*)
- 			PCIACCESS_LIBS="$PCIACCESS_LIBS -li386"
- 			;;
- 		*x86_64*|*amd64*)
--- 
-2.1.4
-
meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch deleted +0 -32
deleted file mode 100644
index f513c8e59c8..00000000000
@@ -1,32 +0,0 @@
-From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001
-From: Felix Janda <[email protected]>
-Date: Fri, 1 May 2015 16:36:50 +0200
-Subject: [PATCH 3/4] linux_sysfs.c: Include <limits.h> for PATH_MAX
-
-Fixes compilation with musl libc.
-
-Tested-by: Bernd Kuhls <[email protected]>
-Signed-off-by: Felix Janda <[email protected]>
-Reviewed-by: Alan Coopersmith <[email protected]>
-Signed-off-by: Alan Coopersmith <[email protected]>
----
-Upstream-Status: Backport
-
- src/linux_sysfs.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c
-index 50d94cf..3f95e53 100644
---- a/src/linux_sysfs.c
-+++ b/src/linux_sysfs.c
-@@ -45,6 +45,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
--- 
-2.1.4
-
meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb renamed from meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb +2 -5
similarity index 54%
rename from meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb
rename to meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb
index ffa6a609f3e..a3b682b09b6 100644
@@ -6,14 +6,11 @@ PCI bus and devices in a platform-independent way."
 require xorg-lib-common.inc
 
 SRC_URI += "\
-            file://0001-Include-config.h-before-anything-else-in-.c.patch \
-            file://0002-Fix-quoting-issue.patch \
-            file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \
             file://0004-Don-t-include-sys-io.h-on-arm.patch \
 "
 
-SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f"
-SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf"
+SRC_URI[md5sum] = "d810ab17e24c1418dedf7207fb2841d4"
+SRC_URI[sha256sum] = "752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999"
 
 LICENSE = "MIT & MIT-style"
 LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068"
Signature · 1 line
2.11.0
#10 lore raw

PATCH 9/11 db: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-support/db/db_5.3.28.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-support/db/db_5.3.28.bb +4 -0
index 26065bbb0bb..7b158e9e2c9 100644
@@ -23,6 +23,10 @@ SRC_URI += "file://arm-thumb-mutex_db5.patch \
             file://fix-parallel-build.patch \
             file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \
            "
+# We are not interested in official latest 6.x versions;
+# let's track what debian is using.
+UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/db5.3/"
+UPSTREAM_CHECK_REGEX = "db5\.3_(?P<pver>.+)\.orig"
 
 SRC_URI[md5sum] = "b99454564d5b4479750567031d66fe24"
 SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628"
Signature · 1 line
2.11.0
#11 lore raw

PATCH 10/11 dnf: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-devtools/dnf/dnf_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/dnf/dnf_git.bb +1 -0
index 62c7127ac85..c975900f85e 100644
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
 
 PV = "2.3.0"
 SRCREV = "242079563b54b4714c889fd4ee32e8dd9960f3b8"
+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.11.0
#12 lore raw

PATCH 11/11 vulkan: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-graphics/vulkan/vulkan_1.0.39.1.bb +1 -0
index 45d1c493e29..7f0ba216589 100644
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;br
            file://0001-Use-getenv-if-secure_getenv-does-not-exist.patch \
 "
 SRCREV = "9c21ed0fb275589c3af6118aec9ef4f1d1544dc1"
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.11.0
#13 lore raw

✗ patchtest: failure for "ffmpeg: update to 3.3..." and 10 more

In reply to Alexander Kanavin

== Series Details ==

Series: "ffmpeg: update to 3.3..." and 10 more
Revision: 1
URL : https://patchwork.openembedded.org/series/6669/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 1239620182)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#14 lore raw

Re: ✗ patchtest: failure for "ffmpeg: update to 3.3..." and 10 more

Quoted 3 lines · Patchwork

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 1239620182)

Yep, this is meant for ross/mut :)

Alex