{"id":811590,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811590/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/patch/20170908133156.10357-1-ps.report@gmx.net/","project":{"id":27,"url":"http://patchwork.ozlabs.org/api/1.2/projects/27/?format=json","name":"Buildroot development","link_name":"buildroot","list_id":"buildroot.buildroot.org","list_email":"buildroot@buildroot.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170908133156.10357-1-ps.report@gmx.net>","list_archive_url":null,"date":"2017-09-08T13:31:56","name":"[v3] gst1-plugins-bad: fix build against openjpeg 2.2","commit_ref":"3a5d4db9549f6a777b06819bc00146a30d687d22","pull_url":null,"state":"accepted","archived":false,"hash":"c39b01a864d9e8130cfdb0d31112e1586392d21b","submitter":{"id":43323,"url":"http://patchwork.ozlabs.org/api/1.2/people/43323/?format=json","name":"Peter Seiderer","email":"ps.report@gmx.net"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/buildroot/patch/20170908133156.10357-1-ps.report@gmx.net/mbox/","series":[{"id":2210,"url":"http://patchwork.ozlabs.org/api/1.2/series/2210/?format=json","web_url":"http://patchwork.ozlabs.org/project/buildroot/list/?series=2210","date":"2017-09-08T13:31:56","name":"[v3] gst1-plugins-bad: fix build against openjpeg 2.2","version":3,"mbox":"http://patchwork.ozlabs.org/series/2210/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811590/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811590/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","buildroot@lists.busybox.net"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","buildroot@osuosl.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=busybox.net\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=buildroot-bounces@busybox.net;\n\treceiver=)","Received":["from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpdXq1XNTz9s7p\n\tfor ;\n\tFri, 8 Sep 2017 23:32:26 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 121DD88074;\n\tFri, 8 Sep 2017 13:32:22 +0000 (UTC)","from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id PH5cXXqjoN8O; Fri, 8 Sep 2017 13:32:18 +0000 (UTC)","from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id EAA4787FEF;\n\tFri, 8 Sep 2017 13:32:17 +0000 (UTC)","from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id BFF6E1CEB72\n\tfor ;\n\tFri, 8 Sep 2017 13:32:16 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BA9D688F2E\n\tfor ;\n\tFri, 8 Sep 2017 13:32:16 +0000 (UTC)","from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id D1Yb9KPsx+ig for ;\n\tFri, 8 Sep 2017 13:32:14 +0000 (UTC)","from mout.gmx.net (mout.gmx.net [212.227.15.15])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 93CBE88F2C\n\tfor ; Fri, 8 Sep 2017 13:32:13 +0000 (UTC)","from linux.local ([188.99.112.207]) by mail.gmx.com (mrgmx002\n\t[212.227.17.190]) with ESMTPSA (Nemesis) id 0MRo6b-1e1gBF3KoL-00SwAQ;\n\tFri, 08 Sep 2017 15:32:00 +0200"],"X-Virus-Scanned":["amavisd-new at osuosl.org","amavisd-new at osuosl.org"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","From":"Peter Seiderer ","To":"buildroot@busybox.net","Date":"Fri, 8 Sep 2017 15:31:56 +0200","Message-Id":"<20170908133156.10357-1-ps.report@gmx.net>","X-Mailer":"git-send-email 2.12.3","X-Provags-ID":"V03:K0:q1/jDOSezmdsWePy4lzeu+rzdmC1wTHJ5RygLWVDu50AezRzcfN\n\tq3nH+gzx47r+BlVbnnEtrU/FJDlINg+OnJlu2N0dF87kFMGThj9k5e6M0PXjr7mZn8Z4808\n\tq1FUArnYJaXObfzNFpbvtwvC1T4oQQ48MRZz1debffEzkLCXln1gJag8sVM+eCWy8Y0304r\n\tDk4IoB8eYq8ZMMjzplNjg==","X-UI-Out-Filterresults":"notjunk:1; V01:K0:0wGcZoK5DWI=:MLBdbMHREAVFZcEpYaHcky\n\trr5QExrIw/PGZpav/KS4AWisU6ngPiu9BElj1UgvPufqE0xR8TI2jYAyTFWA+xDY6V5x02Bt3\n\tkd3mDLvojqMt1PtR3PRlq+5FFAhFMXITg0H21lCgWFJb5CeSibKQdJZz73ejU3nvdZvYeCaBF\n\tXB4B0Fy4rO3Wxl20xx3oY7ZNpeau5JDi6MAJcKzDP19En/+BkWdQvCFGCyrKlaZ7wpMeKKxMi\n\tCzFic3d7CPSmbGtcXYpltfpOLixYxmJ41PR2phOhxZ5wLdXplj41I3HNCr6LmzFB0wp2AC1pZ\n\tuWBdVLB94u6O9Gh8VXES8wx/N7a5SuVoqLHKpd9gubHTwNiSdvUxTLC3L68dEKZ2ld65caHgI\n\tvWIPK95XLDa5UhCJhXigj+4fLD/ufsM55vOtUAFf8ff14Et3AJjfILOnfP1BvUh1FNzxNyOQl\n\tIj0PYa0fjGWKYVHdek8GqLFQJBiNL7T4ubYVKN7RnsWuqWA9cL8tVI1sw0A8uXgyGiVKQs5Vj\n\tnN9C5CPaYd4NNAIwwU6whEl1Rut37LpNluMFKhvD7t1mYEPvhFigaiWWf4jDZXqBuYem+IwMs\n\tYwQZ+c3F8FIO6ZPJlYGYOyHmomPVJRaU3MM8GUfOZRKk4FEutRVegusEY1fU0B0SYAmehkazC\n\tKII6deNgElXZyB9QB+mogRpMncrst7c0JG6TES8MvwziZ+uj/l3CkJ93Bvu19mjUSzUsO6PjT\n\tLgmay3fDXpSJQ4aDIJVeb4bywxBpQlU3sm0vccxMKEBRUhbQoDA0BhPbtkU8JiLngiK0G5+4v\n\thr/5sSAKWdy50z00F6hFtfFZcr+2A==","Subject":"[Buildroot] [PATCH v3] gst1-plugins-bad: fix build against openjpeg\n\t2.2","X-BeenThere":"buildroot@busybox.net","X-Mailman-Version":"2.1.18-1","Precedence":"list","List-Id":"Discussion and development of buildroot ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"buildroot-bounces@busybox.net","Sender":"\"buildroot\" "},"content":"Add upstream patch to fix build against openjpeg 2.2.\n\nFixes [1]:\n\n gstopenjpeg.h:42:37: fatal error: openjpeg-2.1/openjpeg.h: No such file or directory\n\n[1] http://autobuild.buildroot.net/results/90f1f7838f08e3a557be27470406d4d84dbcc828\n\nSigned-off-by: Peter Seiderer \n---\nChanges v2 -> v3:\n - add _GETTEXTIZE (instead of Makefile.in.in patch, suggested by Thomas Petazzoni)\n\nChanges v1 ->v2:\n - add _AUTORECONF (suggested by Peter Korsgaard)\n---\n ...1-openjpeg-Fix-build-against-openjpeg-2.2.patch | 93 ++++++++++++++++++++++\n .../gst1-plugins-bad/gst1-plugins-bad.mk | 4 +\n 2 files changed, 97 insertions(+)\n create mode 100644 package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch","diff":"diff --git a/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch b/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch\nnew file mode 100644\nindex 0000000000..d9268bc9b6\n--- /dev/null\n+++ b/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch\n@@ -0,0 +1,93 @@\n+From daaf649bda7231fd0d760802232a36ba62a4ea2d Mon Sep 17 00:00:00 2001\n+From: Clemens Lang \n+Date: Sun, 13 Aug 2017 21:17:18 +0200\n+Subject: [PATCH] openjpeg: Fix build against openjpeg 2.2\n+\n+OpenJPEG 2.2 has some API changes and thus ships its headers in a new\n+include path. Add a configure check (to both meson and autoconf) to\n+detect the newer version of OpenJPEG and add conditional includes.\n+\n+Fix the autoconf test for OpenJPEG 2.1, which checked for HAVE_OPENJPEG,\n+which was always set even for 2.0.\n+\n+https://bugzilla.gnome.org/show_bug.cgi?id=786250\n+\n+Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/patch/?id=15f24fef53a955c7c76fc966302cb0453732e657\n+Signed-off-by: Peter Seiderer \n+---\n+ configure.ac | 7 ++++++-\n+ ext/openjpeg/gstopenjpeg.h | 4 +++-\n+ ext/openjpeg/meson.build | 21 +++++++++++++--------\n+ 3 files changed, 22 insertions(+), 10 deletions(-)\n+\n+diff --git a/configure.ac b/configure.ac\n+index 30e26b8..c4f08c7 100644\n+--- a/configure.ac\n++++ b/configure.ac\n+@@ -2813,8 +2813,13 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [\n+ if test x\"$HAVE_OPENJPEG\" = x\"yes\"; then\n+ dnl minor API changes in v2.1\n+ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1)\n+- if test x\"$HAVE_OPENJPEG\" = x\"yes\"; then\n++ if test x\"$HAVE_OPENJPEG_2_1\" = x\"yes\"; then\n+ AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used])\n++ dnl include paths changed for v2.2\n++ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2)\n++ if test x\"$HAVE_OPENJPEG_2_2\" = x\"yes\"; then\n++ AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used])\n++ fi\n+ fi\n+ else\n+ # Fallback to v1.5\n+diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h\n+index 03ce52e..52410a4 100644\n+--- a/ext/openjpeg/gstopenjpeg.h\n++++ b/ext/openjpeg/gstopenjpeg.h\n+@@ -38,7 +38,9 @@\n+ #define OPJ_CPRL CPRL\n+ #else\n+ #include \n+-# ifdef HAVE_OPENJPEG_2_1\n++# if defined(HAVE_OPENJPEG_2_2)\n++# include \n++# elif defined(HAVE_OPENJPEG_2_1)\n+ # include \n+ # else\n+ # include \n+diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build\n+index d60974c..e9c416c 100644\n+--- a/ext/openjpeg/meson.build\n++++ b/ext/openjpeg/meson.build\n+@@ -6,16 +6,21 @@ openjpeg_sources = [\n+ \n+ openjpeg_cargs = []\n+ \n+-# Check for 2.1, then 2.0\n+-openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)\n++# Check for 2.2, 2.1, then 2.0\n++openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false)\n+ if openjpeg_dep.found()\n+- openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1']\n++ openjpeg_cargs += ['-DHAVE_OPENJPEG_2_2']\n+ else\n+- openjpeg_dep = dependency('libopenjp2', required : false)\n+- # Fallback to 1.5\n+- if not openjpeg_dep.found()\n+- openjpeg_dep = dependency('libopenjpeg1', required : false)\n+- openjpeg_cargs += ['-DHAVE_OPENJPEG_1']\n++ openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)\n++ if openjpeg_dep.found()\n++ openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1']\n++ else\n++ openjpeg_dep = dependency('libopenjp2', required : false)\n++ # Fallback to 1.5\n++ if not openjpeg_dep.found()\n++ openjpeg_dep = dependency('libopenjpeg1', required : false)\n++ openjpeg_cargs += ['-DHAVE_OPENJPEG_1']\n++ endif\n+ endif\n+ endif\n+ \n+-- \n+2.12.3\n+\ndiff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk\nindex 7a32689b85..8b707d5eb9 100644\n--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk\n+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk\n@@ -13,6 +13,10 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB\n # enabled.\n GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+\n \n+# patch 0001-openjpeg-Fix-build-against-openjpeg-2.2.patch touches configure.ac\n+GST1_PLUGINS_BAD_AUTORECONF = YES\n+GST1_PLUGINS_BAD_GETTEXTIZE = YES\n+\n GST1_PLUGINS_BAD_CONF_OPTS = \\\n \t--disable-examples \\\n \t--disable-valgrind \\\n","prefixes":["v3"]}