Skip to contentSkip to conversation

liburcu: update to 0.11.0

PATCH In review Alexander Kanavin 3 participants 13 messages May 31, 2019 – Jun 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 liburcu: update to 0.11.0

From: Jonathan Rajotte <[email protected]>

Drop backported patch.
Update paths to files that establish the licensing.

---
 ...-support-for-the-RISC-V-architecture.patch | 157 ------------------
 .../{liburcu_0.10.2.bb => liburcu_0.11.0.bb}  |  10 +-
 2 files changed, 4 insertions(+), 163 deletions(-)
 delete mode 100644 meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch
 rename meta/recipes-support/liburcu/{liburcu_0.10.2.bb => liburcu_0.11.0.bb} (65%)
meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch deleted +0 -157
deleted file mode 100644
index b026782bd5e..00000000000
@@ -1,157 +0,0 @@
-From fdfad81006c2c964781b616f0a75578507be809c Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <[email protected]>
-Date: Wed, 21 Mar 2018 17:38:41 -0400
-Subject: [PATCH] Add support for the RISC-V architecture
-
-Tested in QEMU 2.12.0-rc0, requires --disable-compiler-tls to go
-through the benchmarks reliably.
-
-Signed-off-by: Michael Jeanson <[email protected]>
-Signed-off-by: Mathieu Desnoyers <[email protected]>
-Upstream-Status: Backport
----
- configure.ac                 |  1 +
- include/Makefile.am          |  2 ++
- include/urcu/arch/riscv.h    | 49 ++++++++++++++++++++++++++++++++++++++++++++
- include/urcu/uatomic/riscv.h | 44 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 96 insertions(+)
- create mode 100644 include/urcu/arch/riscv.h
- create mode 100644 include/urcu/uatomic/riscv.h
-
-diff --git a/configure.ac b/configure.ac
-index d0b4a9ac..9145081a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -151,6 +151,7 @@ AS_CASE([$host_cpu],
- 	[tile*], [ARCHTYPE="tile"],
- 	[hppa*], [ARCHTYPE="hppa"],
- 	[m68k], [ARCHTYPE="m68k"],
-+	[riscv*], [ARCHTYPE="riscv"],
- 	[ARCHTYPE="unknown"]
- )
- 
-diff --git a/include/Makefile.am b/include/Makefile.am
-index dcdf304b..36667b43 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -27,6 +27,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \
- 	urcu/arch/mips.h \
- 	urcu/arch/nios2.h \
- 	urcu/arch/ppc.h \
-+	urcu/arch/riscv.h \
- 	urcu/arch/s390.h \
- 	urcu/arch/sparc64.h \
- 	urcu/arch/tile.h \
-@@ -43,6 +44,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \
- 	urcu/uatomic/mips.h \
- 	urcu/uatomic/nios2.h \
- 	urcu/uatomic/ppc.h \
-+	urcu/uatomic/riscv.h \
- 	urcu/uatomic/s390.h \
- 	urcu/uatomic/sparc64.h \
- 	urcu/uatomic/tile.h \
-diff --git a/include/urcu/arch/riscv.h b/include/urcu/arch/riscv.h
-new file mode 100644
-index 00000000..1fd7d62b
---- /dev/null
-+++ b/include/urcu/arch/riscv.h
-@@ -0,0 +1,49 @@
-+#ifndef _URCU_ARCH_RISCV_H
-+#define _URCU_ARCH_RISCV_H
-+
-+/*
-+ * arch/riscv.h: definitions for the RISC-V architecture
-+ *
-+ * Copyright (c) 2018 Michael Jeanson <[email protected]>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#include <urcu/compiler.h>
-+#include <urcu/config.h>
-+#include <urcu/syscall-compat.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <stdlib.h>
-+#include <sys/time.h>
-+
-+/*
-+ * On Linux, define the membarrier system call number if not yet available in
-+ * the system headers.
-+ */
-+#if (defined(__linux__) && !defined(__NR_membarrier))
-+#define __NR_membarrier		283
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#include <urcu/arch/generic.h>
-+
-+#endif /* _URCU_ARCH_RISCV_H */
-diff --git a/include/urcu/uatomic/riscv.h b/include/urcu/uatomic/riscv.h
-new file mode 100644
-index 00000000..a6700e17
---- /dev/null
-+++ b/include/urcu/uatomic/riscv.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Atomic exchange operations for the RISC-V architecture. Let GCC do it.
-+ *
-+ * Copyright (c) 2018 Michael Jeanson <[email protected]>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to
-+ * deal in the Software without restriction, including without limitation the
-+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+ * sell copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-+ * IN THE SOFTWARE.
-+ */
-+
-+#ifndef _URCU_ARCH_UATOMIC_RISCV_H
-+#define _URCU_ARCH_UATOMIC_RISCV_H
-+
-+#include <urcu/compiler.h>
-+#include <urcu/system.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define UATOMIC_HAS_ATOMIC_BYTE
-+#define UATOMIC_HAS_ATOMIC_SHORT
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#include <urcu/uatomic/generic.h>
-+
-+#endif /* _URCU_ARCH_UATOMIC_RISCV_H */
meta/recipes-support/liburcu/liburcu_0.11.0.bb renamed from meta/recipes-support/liburcu/liburcu_0.10.2.bb +4 -6
similarity index 65%
rename from meta/recipes-support/liburcu/liburcu_0.10.2.bb
rename to meta/recipes-support/liburcu/liburcu_0.11.0.bb
index b4b6e2323dc..df41ffc73e1 100644
@@ -4,15 +4,13 @@ BUGTRACKER = "http://lttng.org/project/issues"
 
 LICENSE = "LGPLv2.1+ & MIT-style"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e548d28737289d75a8f1e01ba2fd7825 \
-                    file://src/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \
+                    file://include/urcu/urcu.h;beginline=4;endline=32;md5=4de0d68d3a997643715036d2209ae1d9 \
                     file://include/urcu/uatomic/x86.h;beginline=4;endline=21;md5=58e50bbd8a2f073bb5500e6554af0d0b"
 
-SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2 \
-           file://Add-support-for-the-RISC-V-architecture.patch \
-           "
+SRC_URI = "http://lttng.org/files/urcu/userspace-rcu-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "7c424c5183ec009d87e0f70c23e92f1b"
-SRC_URI[sha256sum] = "b3f6888daf6fe02c1f8097f4a0898e41b5fe9975e121dc792b9ddef4b17261cc"
+SRC_URI[md5sum] = "102184afa99e64e3ecefb320092ac1e4"
+SRC_URI[sha256sum] = "1af5694c4f6266f4eba5eb4b832daee600d1e7055fce6da5d514d735d72eb3e7"
 
 S = "${WORKDIR}/userspace-rcu-${PV}"
 inherit autotools multilib_header
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/8 perl: update to 5.30.0

---
 .../files/perl-configpm-switch.patch          | 21 +++++++++++++------
 .../{perl_5.28.2.bb => perl_5.30.0.bb}        | 12 +++++------
 2 files changed, 20 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/perl-sanity/{perl_5.28.2.bb => perl_5.30.0.bb} (97%)
meta/recipes-devtools/perl-sanity/files/perl-configpm-switch.patch +15 -6
index e6f23eed657..3c2cecb8c18 100644
@@ -1,3 +1,8 @@
+From 7f313cac31c55cbe62a4d0cdfa8321cc05a8eb3a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Sun, 27 May 2007 21:04:11 +0000
+Subject: [PATCH] perl: 5.8.7 -> 5.8.8 (from OE)
+
 This patch is used for perl-native only. It enables the switching of
 configuration files between Config_heavy.pl and
 Config_heavy-target.pl by setting the environment variables
@@ -10,11 +15,15 @@ values would be valid for the host only.
 Upstream-Status: Inappropriate [native]
 Signed-off-by: Alexander Kanavin <[email protected]>
 
-Index: perl-5.14.2/configpm
-===================================================================
---- perl-5.14.2.orig/configpm
-+++ perl-5.14.2/configpm
-@@ -658,7 +658,7 @@ sub FETCH {
+---
+ configpm | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/configpm b/configpm
+index 09c4a3b..6a0a680 100755
+--- a/configpm
++++ b/configpm
+@@ -687,7 +687,7 @@ sub FETCH {
      my($self, $key) = @_;
  
      # check for cached value (which may be undef so we use exists not defined)
@@ -23,7 +32,7 @@ Index: perl-5.14.2/configpm
  }
  
  ENDOFEND
-@@ -816,7 +816,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fa
+@@ -845,7 +845,21 @@ $config_txt .= sprintf <<'ENDOFTIE', $fast_config;
  sub DESTROY { }
  
  sub AUTOLOAD {
meta/recipes-devtools/perl-sanity/perl_5.30.0.bb renamed from meta/recipes-devtools/perl-sanity/perl_5.28.2.bb +5 -7
similarity index 97%
rename from meta/recipes-devtools/perl-sanity/perl_5.28.2.bb
rename to meta/recipes-devtools/perl-sanity/perl_5.30.0.bb
index f175e87a12e..6bd83cc1748 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=5b122a36d0f6dc55279a0ebc69f3c60b \
 
 
 SRC_URI = "https://www.cpan.org/src/5.0/perl-${PV}.tar.gz;name=perl \
-           https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.tar.gz;name=perl-cross \
+           https://github.com/arsv/perl-cross/releases/download/1.3/perl-cross-1.3.tar.gz;name=perl-cross \
            file://perl-rdepends.txt \
            file://0001-configure_tool.sh-do-not-quote-the-argument-to-comma.patch \
            file://0001-ExtUtils-MakeMaker-add-LDFLAGS-when-linking-binary-m.patch \
@@ -23,12 +23,10 @@ SRC_URI_append_class-native = " \
            file://perl-configpm-switch.patch \
 "
 
-SRC_URI[perl.md5sum] = "1323e7581fbedf3791d2843f4ccaec4b"
-SRC_URI[perl.sha256sum] = "aa95456dddb3eb1cc5475fed4e08f91876bea71fb636fba6399054dfbabed6c7"
-SRC_URI[perl-cross.md5sum] = "03d9eafd71161eb5d1f80434e8b49dbc"
-SRC_URI[perl-cross.sha256sum] = "84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c"
-
-PR = "r1"
+SRC_URI[perl.md5sum] = "9770584cdf9b5631c38097645ce33549"
+SRC_URI[perl.sha256sum] = "851213c754d98ccff042caa40ba7a796b2cee88c5325f121be5cbb61bbf975f2"
+SRC_URI[perl-cross.md5sum] = "4dda3daf9c4fe42b3d6a5dd052852a48"
+SRC_URI[perl-cross.sha256sum] = "49edea1ea2cd6c5c47386ca71beda8d150c748835781354dbe7f75b1df27e703"
 
 S = "${WORKDIR}/perl-${PV}"
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/8 python3-pygments: add a recipe

In reply to Alexander Kanavin

This is the new source highlighter used by gtk-doc.

---
 meta/conf/distro/include/maintainers.inc      |  1 +
 .../python/python3-pygments_2.4.2.bb          | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-pygments_2.4.2.bb
meta/conf/distro/include/maintainers.inc +1 -0
index a9a689fb09d..35f10c2a91a 100644
@@ -602,6 +602,7 @@ RECIPE_MAINTAINER_pn-python3-numpy = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pbr = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pip = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pycairo = "Derek Straka <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pygments = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-pygobject = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-setuptools = "Derek Straka <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-six = "Derek Straka <[email protected]>"
meta/recipes-devtools/python/python3-pygments_2.4.2.bb new file +20 -0
new file mode 100644
index 00000000000..35c0ac6a578
@@ -0,0 +1,20 @@
+SUMMARY = "Pygments is a syntax highlighting package written in Python."
+DESCRIPTION = "Pygments is a syntax highlighting package written in Python."
+HOMEPAGE = "http://pygments.org/"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e1d7b7bffbfeaa14083fd2bd3236aea8"
+
+inherit setuptools3
+SRC_URI[md5sum] = "5ecc3fbb2a783e917b369271fc0e6cd1"
+SRC_URI[sha256sum] = "881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"
+
+DEPENDS += "\
+            ${PYTHON_PN} \
+            "
+
+PYPI_PACKAGE = "Pygments"
+
+inherit pypi
+
+BBCLASSEXTEND = "native nativesdk"
+
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/8 gtk-doc: upgrade 1.29 -> 1.30

In reply to Alexander Kanavin

Source-highlight support has been replaced upstream with python3-pygments.

---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch    | 6 +++---
 .../gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb}            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb} (87%)
meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +3 -3
index 9b128e1ce12..3e973a16eb0 100644
@@ -1,4 +1,4 @@
-From 04af15322f677db42ecc2acc465334a04de9a871 Mon Sep 17 00:00:00 2001
+From a3f69f2ed45efbdaee47c2dde4df3d78323300e5 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Mon, 5 Sep 2016 22:25:44 +0100
 Subject: [PATCH] Use native pkg-config when looking for gtk-doc.
@@ -7,10 +7,10 @@ Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <[email protected]>
 
 ---
- gtk-doc.m4 | 7 ++++++-
+ buildsystems/autotools/gtk-doc.m4 | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/gtk-doc.m4 b/gtk-doc.m4
+diff --git a/buildsystems/autotools/gtk-doc.m4 b/buildsystems/autotools/gtk-doc.m4
 index 2d12f01..e5afc3f 100644
 --- a/buildsystems/autotools/gtk-doc.m4
 +++ b/buildsystems/autotools/gtk-doc.m4
meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb renamed from meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb +3 -3
similarity index 87%
rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.29.bb
rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.30.bb
index 2c4ee175a95..f16847e40c1 100644
@@ -15,11 +15,11 @@ PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation",
 # into its scripts. This means that target gtk-doc package is broken;
 # hopefully no one minds because its scripts are not used for anything during build
 # and shouldn't be used on targets.
-PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native python3-six"
+PACKAGECONFIG[working-scripts] = ",,libxslt-native xmlto-native python3-six python3-pygments"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,glib-2.0"
 
-SRC_URI[archive.md5sum] = "df26a38c209b3d7358f26268fcbdb9e3"
-SRC_URI[archive.sha256sum] = "14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1"
+SRC_URI[archive.md5sum] = "1045ba29ca0693ced2045523407aae4c"
+SRC_URI[archive.sha256sum] = "a4f6448eb838ccd30d76a33b1fd095f81aea361f03b12c7b23df181d21b7069e"
 SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \
            file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \
            file://conditionaltests.patch \
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH 4/8] gtk-doc: upgrade 1.29 -> 1.30

Quoted 4 lines · Alexander Kanavin

Source-highlight support has been replaced upstream with python3- pygments.

Quoted 8 lines
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch    | 6 +++-
--
 .../gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb}            | 6 +++-
--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.29.bb => gtk-

doc_1.30.bb} (87%)

I this this update caused a doc failure in libpsl:

https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/655

Cheers,

Richard

#5 lore raw

Re: [PATCH 4/8] gtk-doc: upgrade 1.29 -> 1.30

Thanks, I just resent the patchset with a fix.

Alex

Quoted 23 lines · Richard Purdie
Quoted 4 lines · Alexander Kanavin

Source-highlight support has been replaced upstream with python3- pygments.

Quoted 8 lines
---
 meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch    | 6 +++-
--
 .../gtk-doc/{gtk-doc_1.29.bb => gtk-doc_1.30.bb}            | 6 +++-
--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename meta/recipes-gnome/gtk-doc/{gtk-doc_1.29.bb => gtk-

doc_1.30.bb} (87%)

I this this update caused a doc failure in libpsl:

https://autobuilder.yoctoproject.org/typhoon/#/builders/69/builds/655

Cheers,

Richard

#6 lore raw

PATCH 5/8 source-highlight: remove the recipe

In reply to Alexander Kanavin

gtk-doc was the only user, and has been switched over to python3-pygments.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 ....pc.in-do-not-add-Boost-s-libraries-.patch | 30 -------------------
 .../source-highlight_3.1.8.bb                 | 28 -----------------
 3 files changed, 59 deletions(-)
 delete mode 100644 meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch
 delete mode 100644 meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
meta/conf/distro/include/maintainers.inc +0 -1
index 35f10c2a91a..d6f66510e32 100644
@@ -645,7 +645,6 @@ RECIPE_MAINTAINER_pn-shutdown-desktop = "Alexander Kanavin <[email protected]
 RECIPE_MAINTAINER_pn-signing-keys = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-slang = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-socat = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER_pn-source-highlight = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-speex = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-speexdsp = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <[email protected]>"
meta/recipes-support/source-highlight/files/0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch deleted +0 -30
deleted file mode 100644
index b0aa5d17393..00000000000
@@ -1,30 +0,0 @@
-From 9aa01fd5f9d8b2b98c34684dc8f68115750ef41c Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <[email protected]>
-Date: Tue, 12 Jul 2016 17:15:13 +0300
-Subject: [PATCH] source-highlight.pc.in: do not add Boost's libraries and
- includes
-
-This breaks when compiling in sysroots; a proper way is to use Depends
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <[email protected]>
----
- source-highlight.pc.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source-highlight.pc.in b/source-highlight.pc.in
-index 79ab63e..64114a7 100644
---- a/source-highlight.pc.in
-+++ b/source-highlight.pc.in
-@@ -7,6 +7,6 @@ Name: libsource-highlight
- Description: GNU Source-highlight library.
- URL: http://www.gnu.org/software/src-highlite/
- Version: @VERSION@
--Libs: -L${libdir} -lsource-highlight @BOOST_LDFLAGS@ @BOOST_REGEX_LIB@
--Cflags: -I${includedir} @BOOST_CPPFLAGS@
-+Libs: -L${libdir} -lsource-highlight
-+Cflags: -I${includedir}
- 
--- 
-2.8.1
-
meta/recipes-support/source-highlight/source-highlight_3.1.8.bb deleted +0 -28
deleted file mode 100644
index 85923e47596..00000000000
@@ -1,28 +0,0 @@
-SUMMARY = "Syntax highlight utility"
-DESCRIPTION = "Source-highlight converts source code to formatted text with syntax highlighting."
-HOMEPAGE = "https://www.gnu.org/software/src-highlite/"
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
-
-SRC_URI = "${GNU_MIRROR}/src-highlite/${BPN}-${PV}.tar.gz \
-           file://0001-source-highlight.pc.in-do-not-add-Boost-s-libraries-.patch"
-SRC_URI[md5sum] = "3243470706ef5fefdc3e43b5306a4e41"
-SRC_URI[sha256sum] = "01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3"
-
-inherit autotools
-
-DEPENDS_append = " boost"
-
-DEPENDS_append_class-target = " source-highlight-native"
-
-EXTRA_OECONF = "--with-boost=yes --with-boost-libdir=${STAGING_DIR_TARGET}${libdir}"
-
-BBCLASSEXTEND = "native"
-
-# source-highlight is using its own binary from the build tree to make documentation
-# let's substitute the native binary instead
-do_configure_prepend_class-target () {
-        sed -i -e 's,^SRCHILITEEXE = $(top_builddir).*,SRCHILITEEXE = source-highlight,' ${S}/doc/Makefile.am
-}
-
-RDEPENDS_source-highlight += "bash"
Signature · 1 line
2.17.1
#7 lore raw

PATCH 6/8 piglit: upgrade to latest revision

In reply to Alexander Kanavin

Switch to gitlab.freedesktop.org, as the previous location is now a mirror of that and may be taken down.

Remove upstreamed patches.

---
 ...UPWARD-only-if-its-defined-in-fenv.h.patch | 75 -------------------
 .../piglit/piglit/format-fix.patch            | 69 -----------------
 meta/recipes-graphics/piglit/piglit_git.bb    |  7 +-
 3 files changed, 2 insertions(+), 149 deletions(-)
 delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch
 delete mode 100644 meta/recipes-graphics/piglit/piglit/format-fix.patch
meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch deleted +0 -75
deleted file mode 100644
index 57eda2e207b..00000000000
@@ -1,75 +0,0 @@
-Upstream-Status: Submitted [mailing list]
-Signed-off-by: Ross Burton <[email protected]>
-
-From 0e0a2a69261031d55d52b6045990e8982ea12912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 9 Jul 2016 07:52:19 +0000
-Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present
-
-On ARM, musl does not define FE_* when the architecture does not have VFP (which
-is the right interpretation).
-
-As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't
-available.
-
-Signed-off-by: Ross Burton <[email protected]>
----
- tests/general/roundmode-getintegerv.c | 12 ++++++++----
- tests/general/roundmode-pixelstore.c  | 12 ++++++++----
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c
-index 28ecfaf55..aa99044a1 100644
---- a/tests/general/roundmode-getintegerv.c
-+++ b/tests/general/roundmode-getintegerv.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--	int ret;
- 	bool pass = true;
--	ret = fesetround(FE_UPWARD);
--	if (ret != 0) {
--		printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+	if (fesetround(FE_UPWARD) != 0) {
-+		printf("Setting rounding mode failed\n");
- 		piglit_report_result(PIGLIT_SKIP);
- 	}
-+#else
-+	printf("Cannot set rounding mode\n");
-+	piglit_report_result(PIGLIT_SKIP);
-+#endif
- 
- 	pass = test(2.2, 2) && pass;
- 	pass = test(2.8, 3) && pass;
-diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c
-index 8a029b257..57ec11c09 100644
---- a/tests/general/roundmode-pixelstore.c
-+++ b/tests/general/roundmode-pixelstore.c
-@@ -79,13 +79,17 @@ test(float val, int expect)
- void
- piglit_init(int argc, char **argv)
- {
--	int ret;
- 	bool pass = true;
--	ret = fesetround(FE_UPWARD);
--	if (ret != 0) {
--		printf("Couldn't set rounding mode\n");
-+
-+#ifdef FE_UPWARD
-+	if (fesetround(FE_UPWARD) != 0) {
-+		printf("Setting rounding mode failed\n");
- 		piglit_report_result(PIGLIT_SKIP);
- 	}
-+#else
-+	printf("Cannot set rounding mode\n");
-+	piglit_report_result(PIGLIT_SKIP);
-+#endif
- 
- 	pass = test(2.2, 2) && pass;
- 	pass = test(2.8, 3) && pass;
--- 
-2.11.0
-
meta/recipes-graphics/piglit/piglit/format-fix.patch deleted +0 -69

69 lines not on this page · raw message

meta/recipes-graphics/piglit/piglit_git.bb +2 -5
index b6542a191cf..4350823f60b 100644
@@ -2,16 +2,13 @@ SUMMARY = "OpenGL driver testing framework"
 LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
 
-SRC_URI = "git://anongit.freedesktop.org/piglit \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit;protocol=https \
            file://0001-cmake-install-bash-completions-in-the-right-place.patch \
-           file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
            file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
-           file://format-fix.patch \
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-# From 2018-10-26
-SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5"
+SRCREV = "4294b15e3b84a96f24d1286b73d5832eea267bbf"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
Signature · 1 line
2.17.1
#8 lore raw

PATCH 7/8 mesa: switch over to official git

In reply to Alexander Kanavin

The tarballs for all versions prior to 18.x have been moved to
https://mesa.freedesktop.org/archive/older-versions/

To avoid this practice causing fetching failures in the future, let's use the git.

---
 meta/recipes-graphics/mesa/mesa_19.0.3.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
meta/recipes-graphics/mesa/mesa_19.0.3.bb +6 -4
index 8a72df10147..001c2f41237 100644
@@ -1,13 +1,15 @@
 require ${BPN}.inc
 
-SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
+def ver_branch(v):
+    return oe.utils.trim_version(v, 2)
+
+SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https;branch=${@ver_branch("${PV}")} \
            file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0001-meson.build-make-TLS-GLX-optional-again.patch \
            file://0001-Allow-enable-DRI-without-DRI-drivers.patch \
            "
-
-SRC_URI[md5sum] = "d03bf14e42c0e54ebae5730712ccc408"
-SRC_URI[sha256sum] = "f027244e38dc309a4c12db45ef79be81ab62c797a50a88d566e4edb6159fc4d5"
+SRCREV = "c8cdee5dc3c6f9856ee73aed2b47cee77d675022"
+S = "${WORKDIR}/git"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH 7/8] mesa: switch over to official git

Quoted 5 lines · Alexander Kanavin

The tarballs for all versions prior to 18.x have been moved to
https://mesa.freedesktop.org/archive/older-versions/

To avoid this practice causing fetching failures in the future, let's use the git.

I'm really not sure we want to move things over to git, it does end up making the build process slower as they take longer to fetch, unpack and clean up :/.

Cheers,

Richard

#10 lore raw

Re: [PATCH 7/8] mesa: switch over to official git

Quoted 10 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

The tarballs for all versions prior to 18.x have been moved to
https://mesa.freedesktop.org/archive/older-versions/

To avoid this practice causing fetching failures in the future, let's use the git.

I'm really not sure we want to move things over to git, it does end up making the build process slower as they take longer to fetch, unpack and clean up :/.

Maybe explain to upstream that this older-versions/ thing is just a bit annoying for distros and they'll remove it?

The alternative is to do what libpng already does for this situation:

recipes-multimedia/libpng/libpng_1.6.37.bb:
MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}/"

Not pretty, but it works.

Ross

Ross

#11 lore raw

Re: [PATCH 7/8] mesa: switch over to official git

Quoted 16 lines · Ross
Quoted 10 lines · Richard Purdie
Quoted 5 lines · Alexander Kanavin

The tarballs for all versions prior to 18.x have been moved to
https://mesa.freedesktop.org/archive/older-versions/

To avoid this practice causing fetching failures in the future, let's use the git.

I'm really not sure we want to move things over to git, it does end up making the build process slower as they take longer to fetch, unpack and clean up :/.

Maybe explain to upstream that this older-versions/ thing is just a bit annoying for distros and they'll remove it?

Quoted 8 lines

The alternative is to do what libpng already does for this situation:

recipes-multimedia/libpng/libpng_1.6.37.bb:
MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}/"

Not pretty, but it works.

Anyway, I dropped the patches, and updated mesa-demos to 8.4.0 instead. They published the 8.4.0 tarball where upstream version checker didn't look, and so 8.3.0 was reported as latest :-( It's this lack of consistency about where mesa upstream places tarballs which makes me reluctant to add the MIRRORS hack.

Alex

#12 lore raw

PATCH 8/8 mesa-demos: switch to using official git

In reply to Alexander Kanavin

See the previous mesa commit for the rationale.

Drop 0001-mesa-demos-Add-missing-data-files.patch as it adds files present in git but missing in tarballs.

---
 ...01-mesa-demos-Add-missing-data-files.patch | 624 ------------------
 .../recipes-graphics/mesa/mesa-demos_8.3.0.bb |   7 +-
 2 files changed, 3 insertions(+), 628 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch
meta/recipes-graphics/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch deleted +0 -624
deleted file mode 100644
index 93ee9c286d0..00000000000
@@ -1,624 +0,0 @@
-From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001
-From: Drew Moseley <[email protected]>
-Date: Mon, 12 May 2014 15:22:32 -0400
-Subject: [PATCH 1/9] mesa-demos: Add missing data files.
-
-Add some data files that are present in the git repository:
-   http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0
-but not in the release tarball
-   ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2
-
-Upstream-Status: Backport
-Signed-off-by: Drew Moseley <[email protected]>
-Signed-off-by: Martin Jansa <[email protected]>
----
- src/fpglsl/depth-read.glsl      |   4 +
- src/fpglsl/infinite-loop.glsl   |   7 +
- src/glsl/CH11-bumpmaptex.frag   |  47 +++++++
- src/glsl/blinking-teapot.frag   |  31 +++++
- src/glsl/blinking-teapot.vert   |  16 +++
- src/glsl/convolution.frag       |  21 +++
- src/glsl/simplex-noise.glsl     | 279 ++++++++++++++++++++++++++++++++++++++++
- src/glsl/skinning.vert          |  24 ++++
- src/perf/glslstateschange1.frag |  19 +++
- src/perf/glslstateschange1.vert |  14 ++
- src/perf/glslstateschange2.frag |  17 +++
- src/perf/glslstateschange2.vert |  14 ++
- src/vpglsl/infinite-loop.glsl   |   8 ++
- 13 files changed, 501 insertions(+)
- create mode 100644 src/fpglsl/depth-read.glsl
- create mode 100644 src/fpglsl/infinite-loop.glsl
- create mode 100644 src/glsl/CH11-bumpmaptex.frag
- create mode 100644 src/glsl/blinking-teapot.frag
- create mode 100644 src/glsl/blinking-teapot.vert
- create mode 100644 src/glsl/convolution.frag
- create mode 100644 src/glsl/simplex-noise.glsl
- create mode 100644 src/glsl/skinning.vert
- create mode 100644 src/perf/glslstateschange1.frag
- create mode 100644 src/perf/glslstateschange1.vert
- create mode 100644 src/perf/glslstateschange2.frag
- create mode 100644 src/perf/glslstateschange2.vert
- create mode 100644 src/vpglsl/infinite-loop.glsl
-
-diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl
-new file mode 100644
-index 0000000..86d298e
---- /dev/null
-+++ b/src/fpglsl/depth-read.glsl
-@@ -0,0 +1,4 @@
-+void main()
-+{
-+   gl_FragColor = gl_FragCoord.zzzz;
-+}
-diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl
-new file mode 100644
-index 0000000..c6dc6ee
---- /dev/null
-+++ b/src/fpglsl/infinite-loop.glsl
-@@ -0,0 +1,7 @@
-+void main() {
-+   vec4 sum = vec4(0);
-+   for (int i = 1; i != 2; i += 2) {
-+      sum += vec4(0.1, 0.1, 0.1, 0.1);
-+   }
-+   gl_FragColor = sum;
-+}
-diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag
-new file mode 100644
-index 0000000..b5dabb4
---- /dev/null
-+++ b/src/glsl/CH11-bumpmaptex.frag
-@@ -0,0 +1,47 @@
-+//
-+// Fragment shader for procedural bumps
-+//
-+// Authors: John Kessenich, Randi Rost
-+//
-+// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. 
-+//
-+// See 3Dlabs-License.txt for license information
-+//
-+// Texture mapping/modulation added by Brian Paul
-+//
-+
-+varying vec3 LightDir;
-+varying vec3 EyeDir;
-+
-+uniform float BumpDensity;     // = 16.0
-+uniform float BumpSize;        // = 0.15
-+uniform float SpecularFactor;  // = 0.5
-+
-+uniform sampler2D Tex;
-+
-+void main()
-+{
-+    vec3 ambient = vec3(0.25);
-+    vec3 litColor;
-+    vec2 c = BumpDensity * gl_TexCoord[0].st;
-+    vec2 p = fract(c) - vec2(0.5);
-+
-+    float d, f;
-+    d = p.x * p.x + p.y * p.y;
-+    f = inversesqrt(d + 1.0);
-+
-+    if (d >= BumpSize)
-+        { p = vec2(0.0); f = 1.0; }
-+
-+    vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz;
-+
-+    vec3 normDelta = vec3(p.x, p.y, 1.0) * f;
-+    litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0));
-+    vec3 reflectDir = reflect(LightDir, normDelta);
-+    
-+    float spec = max(dot(EyeDir, reflectDir), 0.0);
-+    spec *= SpecularFactor;
-+    litColor = min(litColor + spec, vec3(1.0));
-+
-+    gl_FragColor = vec4(litColor, 1.0);
-+}
-diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag
-new file mode 100644
-index 0000000..0db060b
---- /dev/null
-+++ b/src/glsl/blinking-teapot.frag
-@@ -0,0 +1,31 @@
-+#extension GL_ARB_uniform_buffer_object : enable
-+
-+layout(std140) uniform colors0
-+{
-+    float DiffuseCool;
-+    float DiffuseWarm;
-+    vec3  SurfaceColor;
-+    vec3  WarmColor;
-+    vec3  CoolColor;
-+    vec4  some[8];
-+};
-+
-+varying float NdotL;
-+varying vec3  ReflectVec;
-+varying vec3  ViewVec;
-+
-+void main (void)
-+{
-+
-+    vec3 kcool    = min(CoolColor + DiffuseCool * SurfaceColor, 1.0);
-+    vec3 kwarm    = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0);
-+    vec3 kfinal   = mix(kcool, kwarm, NdotL);
-+
-+    vec3 nreflect = normalize(ReflectVec);
-+    vec3 nview    = normalize(ViewVec);
-+
-+    float spec    = max(dot(nreflect, nview), 0.0);
-+    spec          = pow(spec, 32.0);
-+
-+    gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0);
-+}
-diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert
-new file mode 100644
-index 0000000..397d733
---- /dev/null
-+++ b/src/glsl/blinking-teapot.vert
-@@ -0,0 +1,16 @@
-+vec3 LightPosition = vec3(0.0, 10.0, 4.0); 
-+ 
-+varying float NdotL;
-+varying vec3  ReflectVec;
-+varying vec3  ViewVec;
-+ 
-+void main(void)
-+{
-+    vec3 ecPos      = vec3 (gl_ModelViewMatrix * gl_Vertex);
-+    vec3 tnorm      = normalize(gl_NormalMatrix * gl_Normal);
-+    vec3 lightVec   = normalize(LightPosition - ecPos);
-+    ReflectVec      = normalize(reflect(-lightVec, tnorm));
-+    ViewVec         = normalize(-ecPos);
-+    NdotL           = (dot(lightVec, tnorm) + 1.0) * 0.5;
-+    gl_Position     = ftransform();
-+}
-diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag
-new file mode 100644
-index 0000000..e49b8ac
---- /dev/null
-+++ b/src/glsl/convolution.frag
-@@ -0,0 +1,21 @@
-+
-+const int KernelSize = 9;
-+
-+//texture offsets
-+uniform vec2 Offset[KernelSize];
-+//convolution kernel
-+uniform vec4 KernelValue[KernelSize];
-+uniform sampler2D srcTex;
-+uniform vec4 ScaleFactor;
-+uniform vec4 BaseColor;
-+
-+void main(void)
-+{
-+    int i;
-+    vec4 sum = vec4(0.0);
-+    for (i = 0; i < KernelSize; ++i) {
-+        vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]);
-+        sum += tmp * KernelValue[i];
-+    }
-+    gl_FragColor = sum * ScaleFactor + BaseColor;
-+}
-diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl
-new file mode 100644
-index 0000000..b6833cb
---- /dev/null
-+++ b/src/glsl/simplex-noise.glsl
-@@ -0,0 +1,279 @@
-+//
-+// Description : Array and textureless GLSL 2D/3D/4D simplex
-+// noise functions.
-+// Author : Ian McEwan, Ashima Arts.
-+// Maintainer : ijm
-+// Lastmod : 20110223
-+// License : Copyright (C) 2011 Ashima Arts. All rights reserved.
-+// Distributed under the Artistic License 2.0; See LICENCE file.
-+//
-+
-+#define NORMALIZE_GRADIENTS
-+#undef USE_CIRCLE
-+#define COLLAPSE_SORTNET
-+
-+float permute(float x0,vec3 p) {
-+  float x1 = mod(x0 * p.y, p.x);
-+  return floor( mod( (x1 + p.z) *x0, p.x ));
-+  }
-+vec2 permute(vec2 x0,vec3 p) {
-+  vec2 x1 = mod(x0 * p.y, p.x);
-+  return floor( mod( (x1 + p.z) *x0, p.x ));
-+  }
-+vec3 permute(vec3 x0,vec3 p) {
-+  vec3 x1 = mod(x0 * p.y, p.x);
-+  return floor( mod( (x1 + p.z) *x0, p.x ));
-+  }
-+vec4 permute(vec4 x0,vec3 p) {
-+  vec4 x1 = mod(x0 * p.y, p.x);
-+  return floor( mod( (x1 + p.z) *x0, p.x ));
-+  }
-+
-+uniform vec4 pParam;
-+// Example
-+// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.);
-+
-+float taylorInvSqrt(float r)
-+  {
-+  return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r );
-+  }
-+
-+float simplexNoise2(vec2 v)
-+  {
-+  const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.;
-+                      0.366025403784438597); // 0.5*(sqrt(3.0)-1.);
-+  const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312;
-+// First corner
-+  vec2 i = floor(v + dot(v, C.yy) );
-+  vec2 x0 = v - i + dot(i, C.xx);
-+
-+// Other corners
-+  vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ;
-+
-+   // x0 = x0 - 0. + 0. * C
-+  vec2 x1 = x0 - i1 + 1. * C.xx ;
-+  vec2 x2 = x0 - 1. + 2. * C.xx ;
-+
-+// Permutations
-+  i = mod(i, pParam.x);
-+  vec3 p = permute( permute(
-+             i.y + vec3(0., i1.y, 1. ), pParam.xyz)
-+           + i.x + vec3(0., i1.x, 1. ), pParam.xyz);
-+
-+#ifndef USE_CIRCLE
-+// ( N points uniformly over a line, mapped onto a diamond.)
-+  vec3 x = fract(p / pParam.w) ;
-+  vec3 h = 0.5 - abs(x) ;
-+
-+  vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.;
-+  vec3 sh = vec3(lessThan(h,D.xxx));
-+
-+  vec3 a0 = x + sx*sh;
-+  vec2 p0 = vec2(a0.x,h.x);
-+  vec2 p1 = vec2(a0.y,h.y);
-+  vec2 p2 = vec2(a0.z,h.z);
-+
-+#ifdef NORMALISE_GRADIENTS
-+  p0 *= taylorInvSqrt(dot(p0,p0));
-+  p1 *= taylorInvSqrt(dot(p1,p1));
-+  p2 *= taylorInvSqrt(dot(p2,p2));
-+#endif
-+
-+  vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) );
-+#else
-+// N points around a unit circle.
-+  vec3 phi = D.z * mod(p,pParam.w) /pParam.w ;
-+  vec4 a0 = sin(phi.xxyy+D.xyxy);
-+  vec2 a1 = sin(phi.zz +D.xy);
-+  vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) );
-+#endif
-+// mix
-+  vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.);
-+  m = m*m ;
-+  return 1.66666* 70.*dot(m*m, g);
-+  }
-+
-+float simplexNoise3(vec3 v)
-+  {
-+  const vec2 C = vec2(1./6. , 1./3. ) ;
-+  const vec4 D = vec4(0., 0.5, 1.0, 2.0);
-+
-+// First corner
-+  vec3 i = floor(v + dot(v, C.yyy) );
-+  vec3 x0 = v - i + dot(i, C.xxx) ;
-+  
-+// Other corners
-+#ifdef COLLAPSE_SORTNET
-+  vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) );
-+  vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) );
-+
-+  vec3 i1 = g.xyz * l.zxy;
-+  vec3 i2 = max( g.xyz, l.zxy);
-+#else
-+// Keeping this clean - let the compiler optimize.
-+  vec3 q1;
-+  q1.x = max(x0.x, x0.y);
-+  q1.y = min(x0.x, x0.y);
-+  q1.z = x0.z;
-+
-+  vec3 q2;
-+  q2.x = max(q1.x,q1.z);
-+  q2.z = min(q1.x,q1.z);
-+  q2.y = q1.y;
-+
-+  vec3 q3;
-+  q3.y = max(q2.y, q2.z);
-+  q3.z = min(q2.y, q2.z);
-+  q3.x = q2.x;
-+
-+  vec3 i1 = vec3(equal(q3.xxx, x0));
-+  vec3 i2 = i1 + vec3(equal(q3.yyy, x0));
-+#endif
-+
-+   // x0 = x0 - 0. + 0. * C
-+  vec3 x1 = x0 - i1 + 1. * C.xxx;
-+  vec3 x2 = x0 - i2 + 2. * C.xxx;
-+  vec3 x3 = x0 - 1. + 3. * C.xxx;
-+
-+// Permutations
-+  i = mod(i, pParam.x );
-+  vec4 p = permute( permute( permute(
-+             i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz)
-+           + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz)
-+           + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz);
-+
-+// Gradients
-+// ( N*N points uniformly over a square, mapped onto a octohedron.)
-+  float n_ = 1.0/pParam.w ;
-+  vec3 ns = n_ * D.wyz - D.xzx ;
-+
-+  vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N)
-+
-+  vec4 x_ = floor(j * ns.z) ;
-+  vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N)
-+
-+  vec4 x = x_ *ns.x + ns.yyyy;
-+  vec4 y = y_ *ns.x + ns.yyyy;
-+  vec4 h = 1. - abs(x) - abs(y);
-+
-+  vec4 b0 = vec4( x.xy, y.xy );
-+  vec4 b1 = vec4( x.zw, y.zw );
-+
-+  vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.;
-+  vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.;
-+  vec4 sh = vec4(lessThan(h, D.xxxx));
-+
-+  vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ;
-+  vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ;
-+
-+  vec3 p0 = vec3(a0.xy,h.x);
-+  vec3 p1 = vec3(a0.zw,h.y);
-+  vec3 p2 = vec3(a1.xy,h.z);
-+  vec3 p3 = vec3(a1.zw,h.w);
-+
-+#ifdef NORMALISE_GRADIENTS
-+  p0 *= taylorInvSqrt(dot(p0,p0));
-+  p1 *= taylorInvSqrt(dot(p1,p1));
-+  p2 *= taylorInvSqrt(dot(p2,p2));
-+  p3 *= taylorInvSqrt(dot(p3,p3));
-+#endif
-+
-+// Mix
-+  vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.);
-+  m = m * m;
-+//used to be 64.
-+  return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1),
-+                                dot(p2,x2), dot(p3,x3) ) );
-+  }
-+
-+vec4 grad4(float j, vec4 ip)
-+  {
-+  const vec4 ones = vec4(1.,1.,1.,-1.);
-+  vec4 p,s;
-+
-+  p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0;
-+  p.w = 1.5 - dot(abs(p.xyz), ones.xyz);
-+  s = vec4(lessThan(p,vec4(0.)));
-+  p.xyz = p.xyz + (s.xyz*2.-1.) * s.www;
-+
-+  return p;
-+  }
-+
-+float simplexNoise4(vec4 v)
-+  {
-+  const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4
-+                        0.309016994374947451); // (sqrt(5) - 1)/4 F4
-+// First corner
-+  vec4 i = floor(v + dot(v, C.yyyy) );
-+  vec4 x0 = v - i + dot(i, C.xxxx);
-+
-+// Other corners
-+
-+// Force existance of strict total ordering in sort.
-+  vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.);
-+  vec4 q1;
-+  q1.xy = max(q0.xy,q0.zw); // x:z y:w
-+  q1.zw = min(q0.xy,q0.zw);
-+
-+  vec4 q2;
-+  q2.xz = max(q1.xz,q1.yw); // x:y z:w
-+  q2.yw = min(q1.xz,q1.yw);
-+  
-+  vec4 q3;
-+  q3.y = max(q2.y,q2.z); // y:z
-+  q3.z = min(q2.y,q2.z);
-+  q3.xw = q2.xw;
-+
-+  vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0));
-+  vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0));
-+  vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0));
-+
-+   // x0 = x0 - 0. + 0. * C
-+  vec4 x1 = x0 - i1 + 1. * C.xxxx;
-+  vec4 x2 = x0 - i2 + 2. * C.xxxx;
-+  vec4 x3 = x0 - i3 + 3. * C.xxxx;
-+  vec4 x4 = x0 - 1. + 4. * C.xxxx;
-+
-+// Permutations
-+  i = mod(i, pParam.x );
-+  float j0 = permute( permute( permute( permute (
-+              i.w, pParam.xyz) + i.z, pParam.xyz)
-+            + i.y, pParam.xyz) + i.x, pParam.xyz);
-+  vec4 j1 = permute( permute( permute( permute (
-+             i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz)
-+           + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz)
-+           + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz)
-+           + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz);
-+// Gradients
-+// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.)
-+  vec4 ip = pParam ;
-+  ip.xy *= pParam.w ;
-+  ip.x *= pParam.w ;
-+  ip = vec4(1.,1.,1.,2.) / ip ;
-+
-+  vec4 p0 = grad4(j0, ip);
-+  vec4 p1 = grad4(j1.x, ip);
-+  vec4 p2 = grad4(j1.y, ip);
-+  vec4 p3 = grad4(j1.z, ip);
-+  vec4 p4 = grad4(j1.w, ip);
-+
-+#ifdef NORMALISE_GRADIENTS
-+  p0 *= taylorInvSqrt(dot(p0,p0));
-+  p1 *= taylorInvSqrt(dot(p1,p1));
-+  p2 *= taylorInvSqrt(dot(p2,p2));
-+  p3 *= taylorInvSqrt(dot(p3,p3));
-+  p4 *= taylorInvSqrt(dot(p4,p4));
-+#endif
-+
-+// Mix
-+  vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.);
-+  vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.);
-+  m0 = m0 * m0;
-+  m1 = m1 * m1;
-+  return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 )))
-+               + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ;
-+
-+  }
-+
-+
-+
-diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert
-new file mode 100644
-index 0000000..28970ee
---- /dev/null
-+++ b/src/glsl/skinning.vert
-@@ -0,0 +1,24 @@
-+// Vertex weighting/blendin shader
-+// Brian Paul
-+// 4 Nov 2008
-+
-+uniform mat4 mat0, mat1;
-+attribute float weight;
-+
-+void main() 
-+{
-+   // simple diffuse shading
-+   // Note that we should really transform the normal vector along with
-+   // the postion below... someday.
-+   vec3 lightVec = vec3(0, 0, 1);
-+   vec3 norm = gl_NormalMatrix * gl_Normal;
-+   float dot = 0.2 + max(0.0, dot(norm, lightVec));
-+   gl_FrontColor = vec4(dot);
-+
-+   // compute sum of weighted transformations
-+   vec4 pos0 = mat0 * gl_Vertex;
-+   vec4 pos1 = mat1 * gl_Vertex;
-+   vec4 pos = mix(pos0, pos1, weight);
-+
-+   gl_Position = gl_ModelViewProjectionMatrix * pos;
-+}
-diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag
-new file mode 100644
-index 0000000..0839436
---- /dev/null
-+++ b/src/perf/glslstateschange1.frag
-@@ -0,0 +1,19 @@
-+// Multi-texture fragment shader
-+// Brian Paul
-+
-+// Composite second texture over first.
-+// We're assuming the 2nd texture has a meaningful alpha channel.
-+
-+uniform sampler2D tex1;
-+uniform sampler2D tex2;
-+uniform vec4 UniV1;
-+uniform vec4 UniV2;
-+
-+void main()
-+{
-+   vec4 t3;
-+   vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
-+   vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
-+   t3 = mix(t1, t2, t2.w);
-+   gl_FragColor = t3 + UniV1 + UniV2;
-+}
-diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert
-new file mode 100644
-index 0000000..cef50db
---- /dev/null
-+++ b/src/perf/glslstateschange1.vert
-@@ -0,0 +1,14 @@
-+// Multi-texture vertex shader
-+// Brian Paul
-+
-+
-+attribute vec4 TexCoord0, TexCoord1;
-+attribute vec4 VertCoord;
-+
-+void main()
-+{
-+   gl_TexCoord[0] = TexCoord0;
-+   gl_TexCoord[1] = TexCoord1;
-+   // note: may use gl_Vertex or VertCoord here for testing:
-+   gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-+}
-diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag
-new file mode 100644
-index 0000000..0df0319
---- /dev/null
-+++ b/src/perf/glslstateschange2.frag
-@@ -0,0 +1,17 @@
-+// Multi-texture fragment shader
-+// Brian Paul
-+
-+// Composite second texture over first.
-+// We're assuming the 2nd texture has a meaningful alpha channel.
-+
-+uniform sampler2D tex1;
-+uniform sampler2D tex2;
-+uniform vec4 UniV1;
-+uniform vec4 UniV2;
-+
-+void main()
-+{
-+   vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
-+   vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
-+   gl_FragColor = t1 + t2 + UniV1 + UniV2;
-+}
-diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert
-new file mode 100644
-index 0000000..cef50db
---- /dev/null
-+++ b/src/perf/glslstateschange2.vert
-@@ -0,0 +1,14 @@
-+// Multi-texture vertex shader
-+// Brian Paul
-+
-+
-+attribute vec4 TexCoord0, TexCoord1;
-+attribute vec4 VertCoord;
-+
-+void main()
-+{
-+   gl_TexCoord[0] = TexCoord0;
-+   gl_TexCoord[1] = TexCoord1;
-+   // note: may use gl_Vertex or VertCoord here for testing:
-+   gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-+}
-diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl
-new file mode 100644
-index 0000000..bc7ae4b
---- /dev/null
-+++ b/src/vpglsl/infinite-loop.glsl
-@@ -0,0 +1,8 @@
-+void main() {
-+   gl_Position = gl_Vertex;
-+   vec4 sum = vec4(0);
-+   for (int i = 1; i != 2; i += 2) {
-+      sum += vec4(0.1, 0.1, 0.1, 0.1);
-+   }
-+   gl_FrontColor = sum;
-+}
--- 
-2.0.0
-
meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb +3 -4
index bae3b18bea5..a82649cc2ad 100644
@@ -9,8 +9,7 @@ LICENSE = "MIT & PD"
 LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \
                     file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06"
 
-SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2 \
-           file://0001-mesa-demos-Add-missing-data-files.patch \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/demos.git;protocol=https \
            file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \
            file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \
            file://0007-Install-few-more-test-programs.patch \
@@ -19,8 +18,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2
            file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \
            file://0013-only-build-GLX-demos-if-needed.patch \
            "
-SRC_URI[md5sum] = "628e75c23c17394f11a316c36f8e4164"
-SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef"
+SRCREV = "0a8779daf6d651f3264dfe0168e92ab2c61a9a67"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig distro_features_check
 # depends on virtual/egl, virtual/libgl ...
Signature · 1 line
2.17.1