From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com ([192.55.52.89] helo=fmsmga101.fm.intel.com) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1TQL1u-0008E4-Dr for openembedded-core@lists.openembedded.org; Mon, 22 Oct 2012 18:39:06 +0200 Received: from mail-lb0-f197.google.com ([209.85.217.197]) by mga01.intel.com with ESMTP/TLS/RC4-SHA; 22 Oct 2012 09:25:39 -0700 Received: by mail-lb0-f197.google.com with SMTP id b5so2147299lbd.0 for ; Mon, 22 Oct 2012 09:25:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=pHznQEHqtNnQVwEJ9DtqeYaOwYKHcKCUCow922E9KLw=; b=omvvVHZJe/KrLSsrlOtCLkh2AsaZragKwKM8fwPnepLTM7jCTHzMuAzuHEwKBsquge i+66DrrRnoAaVVVkqI+Pz0Z7Ta+40P9k3Ps6L5kZnjhh7gXRLzPge2X0eUCIFoSDGCk6 iSR2DBTIQvy0P1q8Abl/gy2molLGjwtRJ8PxNt1P26WDlpm7+UnMDa+qFUz8B8RMb21h DR2oeMgspXua+USZeUD6r26THthdU0w9BMgG7d+/iR/glsSKsJSg7HHdGkeBHPGBDS0D s6AaK6d0C8fKODd2mqvszYat+l3lPheo/cknGSjP4ipx+Mayvx93arRlu9q70CDUivnd mV6w== Received: by 10.180.90.201 with SMTP id by9mr38224346wib.5.1350923134675; Mon, 22 Oct 2012 09:25:34 -0700 (PDT) Received: by 10.180.90.201 with SMTP id by9mr38224330wib.5.1350923134442; Mon, 22 Oct 2012 09:25:34 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPS id hb6sm14976995wib.7.2012.10.22.09.25.33 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 09:25:33 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 22 Oct 2012 17:24:20 +0100 Message-Id: <1350923060-1707-2-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1350923060-1707-1-git-send-email-ross.burton@intel.com> References: <1350907509.2520.86.camel@ted> <1350923060-1707-1-git-send-email-ross.burton@intel.com> X-Gm-Message-State: ALoCoQnLsTRHn6P/02WyPysx7yIgQNGTnDJhFVN0T5cfS2alUDufgldAo8uJlHYOi0PU/GfE1paCvkY61Zq7xvTNLekZAD0oey4JaBsZ5EuFC9U6RZZ7fG28qsOCrW8pPEYvsycOBjV7OTCEELLLhKkNfDXttz4o97FipiPqJmh82oFtHPJLXOSMLQli03ggyLnBuCMuXIDS Subject: [PATCH] mesa: Build separate GLU library X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2012 16:39:06 -0000 From: Daniel Stone Mesa has removed GLU from the core tree upstream, so remove it from the Mesa build, add support for the new GLU tree, and introduce a new virtual/libglu package. Signed-off-by: Daniel Stone Signed-off-by: Ross Burton --- meta/recipes-graphics/glew/glew_1.9.0.bb | 4 ++-- meta/recipes-graphics/mesa/libglu_9.0.0.bb | 27 +++++++++++++++++++++++++++ meta/recipes-graphics/mesa/mesa-common.inc | 7 ++----- 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-graphics/mesa/libglu_9.0.0.bb diff --git a/meta/recipes-graphics/glew/glew_1.9.0.bb b/meta/recipes-graphics/glew/glew_1.9.0.bb index 00fff11..599d64b 100644 --- a/meta/recipes-graphics/glew/glew_1.9.0.bb +++ b/meta/recipes-graphics/glew/glew_1.9.0.bb @@ -5,9 +5,9 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" -DEPENDS = "virtual/libx11 virtual/libgl libxext libxi libxmu" +DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://autotools.patch \ diff --git a/meta/recipes-graphics/mesa/libglu_9.0.0.bb b/meta/recipes-graphics/mesa/libglu_9.0.0.bb new file mode 100644 index 0000000..7980749 --- /dev/null +++ b/meta/recipes-graphics/mesa/libglu_9.0.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "The OpenGL utility toolkit" +DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations" + +HOMEPAGE = "http://mesa3d.org" +BUGTRACKER = "https://bugs.freedesktop.org" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ + file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" + +# Epoch as this used to be part of mesa-dri +PE = "2" +PR = "0" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${PV}.tar.bz2" + +SRC_URI[md5sum] = "be9249132ff49275461cf92039083030" +SRC_URI[sha256sum] = "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12" + +S = "${WORKDIR}/glu-${PV}" + +DEPENDS = "virtual/libgl" + +inherit autotools pkgconfig + +# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty +RDEPENDS_${PN}-dev = "" diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc index faa8183..1ad8ff3 100644 --- a/meta/recipes-graphics/mesa/mesa-common.inc +++ b/meta/recipes-graphics/mesa/mesa-common.inc @@ -12,7 +12,7 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" -INC_PR = "r3" +INC_PR = "r4" PE = "2" DEPENDS = "libxml2-native makedepend-native flex-native bison-native" @@ -24,7 +24,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/mesa:" inherit autotools pkgconfig pythonnative -EXTRA_OECONF = "--enable-glu \ +EXTRA_OECONF = "--disable-glu \ --disable-glw \ --disable-glut \ --enable-shared-glapi" @@ -42,7 +42,6 @@ EXCLUDE_FROM_WORLD = "1" RDEPENDS_${PN}-dev = "" PACKAGES =+ "libegl libegl-dev \ - libglu libglu-dev \ libosmesa libosmesa-dev \ libgl libgl-dev \ libglapi libglapi-dev \ @@ -57,7 +56,6 @@ FILES_libgles1 = "${libdir}/libGLESv1*.so.*" FILES_libgles2 = "${libdir}/libGLESv2.so.*" FILES_libgl = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" -FILES_libglu = "${libdir}/libGLU.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" @@ -66,7 +64,6 @@ FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" FILES_libglapi-dev = "${libdir}/libglapi.*" FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h ${libdir}/pkgconfig/glu.pc" FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/*" -- 1.7.10