summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-graphics/clutter/cogl.inc22
-rw-r--r--meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch23
-rw-r--r--meta/recipes-graphics/clutter/cogl/macro-versions.patch28
-rw-r--r--meta/recipes-graphics/clutter/cogl_1.8.2.bb12
-rw-r--r--meta/recipes-graphics/clutter/cogl_git.bb16
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc58
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb7
7 files changed, 65 insertions, 101 deletions
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
deleted file mode 100644
index 26f7889ca4..0000000000
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ /dev/null
@@ -1,22 +0,0 @@
1DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
3LICENSE = "LGPLv2.1+"
4
5STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
6BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
7
8DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite libxdamage libdrm"
9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
10
11FILESPATH = "${FILE_DIRNAME}/cogl"
12
13inherit autotools pkgconfig gtk-doc gettext
14
15#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
16require clutter-fpu.inc
17
18#Fix up some weirdness in the docs
19do_configure_prepend() {
20 sed -i s:doc/reference/Makefile::g ${S}/configure.ac
21 sed -i s:doc::g ${S}/Makefile.am
22}
diff --git a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch b/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
deleted file mode 100644
index 003e9ff5fa..0000000000
--- a/meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1GCC will define __ARM_ARCH_4T__ when building with "-march=armv4t" so we can
2check this to turn off the use of 'clz' instructions, which otherwise would
3cause compile errors like "selected processor does not support ARM mode
4`clz r3,r0'".
5
6Upstream-Status: Accepted (should be in the next cogl stable release)
7
8Signed-off-by: Wolfgang Denk <wd@denx.de>
9Signed-off-by: Joshua Lock <josh@linux.intel.com>
10
11Index: cogl-1.8.2/cogl/cogl-fixed.c
12===================================================================
13--- cogl-1.8.2.orig/cogl/cogl-fixed.c
14+++ cogl-1.8.2/cogl/cogl-fixed.c
15@@ -626,7 +626,7 @@ cogl_fixed_sqrt (CoglFixed x)
16 /*
17 * Find the highest bit set
18 */
19-#if defined (__arm__)
20+#if defined (__arm__) && !defined(__ARM_ARCH_4T__)
21 /* This actually requires at least arm v5, but gcc does not seem
22 * to set the architecture defines correctly, and it is I think
23 * very unlikely that anyone will want to use clutter on anything
diff --git a/meta/recipes-graphics/clutter/cogl/macro-versions.patch b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
deleted file mode 100644
index 2dcdd8e800..0000000000
--- a/meta/recipes-graphics/clutter/cogl/macro-versions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: cogl-1.8.0/configure.ac
4===================================================================
5--- cogl-1.8.0.orig/configure.ac
6+++ cogl-1.8.0/configure.ac
7@@ -833,7 +833,7 @@ LT_INIT([disable-static])
8 dnl ================================================================
9 dnl I18n stuff.
10 dnl ================================================================
11-AM_GNU_GETTEXT_VERSION([0.17])
12+AM_GNU_GETTEXT_VERSION([0.18])
13 AM_GNU_GETTEXT([external])
14
15 GETTEXT_PACKAGE="cogl"
16Index: cogl-1.8.0/po/Makefile.in.in
17===================================================================
18--- cogl-1.8.0.orig/po/Makefile.in.in
19+++ cogl-1.8.0/po/Makefile.in.in
20@@ -9,7 +9,7 @@
21 # General Public License and is *not* in the public domain.
22 #
23 # Origin: gettext-0.17
24-GETTEXT_MACRO_VERSION = 0.17
25+GETTEXT_MACRO_VERSION = 0.18
26
27 PACKAGE = @PACKAGE@
28 VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
deleted file mode 100644
index fe4266b4a6..0000000000
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require cogl.inc
2
3PR = "r3"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
6
7SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
8 file://macro-versions.patch \
9 file://build_for_armv4t.patch"
10
11SRC_URI[md5sum] = "3145cbf7ff162c33065ea4421c047e2f"
12SRC_URI[sha256sum] = "8b647b51a4fa93034fcd74ffe86b3d4c919b0e54789108f6d065414e6162ab73"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
deleted file mode 100644
index 3fb70ae153..0000000000
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1require cogl.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4
5# the 1.8.2 tag
6SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
7PV = "1.8.2+git${SRCPV}"
8PR = "r4"
9
10DEFAULT_PREFERENCE = "-1"
11
12SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master \
13 file://build_for_armv4t.patch"
14S = "${WORKDIR}/git"
15
16AUTOTOOLS_AUXDIR = "${S}/build"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
new file mode 100644
index 0000000000..17d8629eb9
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -0,0 +1,58 @@
1DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
3LICENSE = "LGPLv2.1+"
4
5inherit clutter
6
7DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
8PACKAGES =+ "${PN}-examples"
9AUTOTOOLS_AUXDIR = "${S}/build"
10
11# Extra DEPENDS for PACKAGECONFIG
12EDEPENDS_GL = "virtual/libgl libdrm"
13EDEPENDS_GLES2 = "virtual/libgles2"
14EDEPENDS_KMS = "libdrm virtual/egl"
15EDEPENDS_EGL = "virtual/egl"
16EDEPENDS_X11 = "virtual/libx11 libxcomposite libxfixes libxi"
17
18# Extra RDEPENDS for PACKAGECONFIG
19# This has to be explictly listed, because cogl dlopens the backends
20ERDEPENDS_GL = "libgl"
21ERDEPENDS_GLES2 = "libgles2"
22
23EXTRA_OECONF += "--disable-introspection \
24 --disable-gtk-doc \
25 ${@get_fpu_setting(bb, d)} \
26 --enable-examples-install \
27 --enable-debug \
28 --disable-gl \
29 --disable-gles1 \
30 --disable-gles2 \
31 --disable-glx \
32 "
33
34# GL flavours
35PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}"
36PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
37
38# egl backends
39PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}"
40PACKAGECONFIG[egl-null] = "--enable-null-egl-platform"
41PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}"
42
43# glx
44PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}"
45
46# Default to GLX
47PACKAGECONFIG ??= "glx"
48
49#Fix up some weirdness in the docs
50do_configure_prepend() {
51 sed -i s:doc/reference/Makefile::g ${S}/configure.ac
52 sed -i s:doc::g ${S}/Makefile.am
53
54 # Disable DOLT
55 sed -i -e 's/^DOLT//' ${S}/configure.ac
56}
57
58FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
new file mode 100644
index 0000000000..0f40c595ac
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb
@@ -0,0 +1,7 @@
1
2require cogl-1.0.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
5
6SRC_URI[archive.md5sum] = "7eabaf4241c0b87cc9e3b0fa23fd0315"
7SRC_URI[archive.sha256sum] = "276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 15:23:14 +0000