I have made the following changes intended for : CE:Apps / mesa-demos Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/8416 Thank You, Marko Saukko [This message was auto-generated] --- Request # 8416: Messages from BOSS: State: review at 2013-03-13T18:17:10 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Apps / mesa-demos -> CE:Apps / mesa-demos changes files: -------------- --- mesa-demos.changes +++ mesa-demos.changes @@ -0,0 +1,3 @@ +* Wed Mar 13 2013 Marko Saukko <[email protected]> - 8.1.0 +- Update to latest upstream version. + old: ---- make-git-snapshot.sh mesa-demos-8.0.1~git60eeb7b306.tar.bz2 new: ---- 0001-GLU-dependency-isn-t-really-needed.patch mesa-demos-8.1.0.tar.gz spec files: ----------- --- mesa-demos.spec +++ mesa-demos.spec @@ -9,14 +9,14 @@ # << macros Summary: Mesa demo applications -Version: 8.0.1~git60eeb7b306 -Release: 0 +Version: 8.1.0 +Release: 1 Group: System/Libraries License: MIT URL: ftp://ftp.freedesktop.org/pub/mesa/demos -Source0: mesa-demos-%{version}.tar.bz2 -Source1: make-git-snapshot.sh +Source0: http://cgit.freedesktop.org/mesa/demos/snapshot/mesa-demos-%{version}.tar.gz Source100: mesa-demos.yaml +Patch0: 0001-GLU-dependency-isn-t-really-needed.patch BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(egl) @@ -24,7 +24,9 @@ BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig autoconf automake +BuildRequires: pkgconfig +BuildRequires: autoconf +BuildRequires: automake %description Mesa demo utilities @@ -48,6 +50,8 @@ %prep %setup -q -n %{name}-%{version} +# 0001-GLU-dependency-isn-t-really-needed.patch +%patch0 -p1 # >> setup # << setup @@ -94,10 +98,6 @@ install -m 0755 src/egl/opengles1/tri_screen $RPM_BUILD_ROOT%{_bindir} install -m 0755 src/egl/opengles1/tri_x11 $RPM_BUILD_ROOT%{_bindir} install -m 0755 src/egl/opengles1/two_win $RPM_BUILD_ROOT%{_bindir} - -install -m 0755 src/egl/opengles2/es2_info $RPM_BUILD_ROOT%{_bindir} -install -m 0755 src/egl/opengles2/es2gears $RPM_BUILD_ROOT%{_bindir} -install -m 0755 src/egl/opengles2/tri $RPM_BUILD_ROOT%{_bindir} # << install post @@ -128,6 +128,7 @@ %{_bindir}/wincopy %{_bindir}/xfont %{_bindir}/xrotfontdemo +%{_datadir}/mesa-demos/* # << files %files -n glx-utils @@ -165,7 +166,5 @@ %{_bindir}/tri_screen %{_bindir}/tri_x11 %{_bindir}/two_win -%{_bindir}/es2_info -%{_bindir}/es2gears -%{_bindir}/tri +%{_bindir}/es2* # << files egl-utils other changes: -------------- ++++++ 0001-GLU-dependency-isn-t-really-needed.patch (new) --- 0001-GLU-dependency-isn-t-really-needed.patch +++ 0001-GLU-dependency-isn-t-really-needed.patch @@ -0,0 +1,49 @@ +From f2439d91954b0d7a05b7541f2b3c0fdd0524d023 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 13 Mar 2013 18:09:47 +0000 +Subject: [PATCH] GLU dependency isn't really needed. + +Signed-off-by: Marko Saukko <[email protected]> +--- + configure.ac | 12 ------------ + src/util/gl_wrap.h | 1 - + 2 files changed, 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 050ac14..396ef6c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,18 +91,6 @@ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" + # LIBS was set by AC_CHECK_LIB above + LIBS="" + +-PKG_CHECK_MODULES(GLU, [glu], [], +- [AC_CHECK_HEADER([GL/glu.h], +- [], +- AC_MSG_ERROR([GLU not found])) +- AC_CHECK_LIB([GLU], +- [gluBeginCurve], +- [GLU_LIBS=-lGLU], +- AC_MSG_ERROR([GLU required])) ]) +- +-DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" +-DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +- + AC_ARG_ENABLE([egl], + [AS_HELP_STRING([--enable-egl], + [enable EGL library @<:@default=no@:>@])], +diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h +index e5ba412..2bf4c4e 100644 +--- a/src/util/gl_wrap.h ++++ b/src/util/gl_wrap.h +@@ -6,7 +6,6 @@ + # include <OpenGL/glu.h> + #else + # include <GL/gl.h> +-# include <GL/glu.h> + #endif + + #ifndef GLAPIENTRY +-- +1.7.10.3 + ++++++ mesa-demos-8.0.1~git60eeb7b306.tar.bz2 -> mesa-demos-8.1.0.tar.gz (130329 lines skipped) ++++++ mesa-demos.yaml --- mesa-demos.yaml +++ mesa-demos.yaml @@ -1,17 +1,20 @@ Name: mesa-demos Summary: Mesa demo applications -Version: 8.0.1~git60eeb7b306 -Release: 0 +Version: 8.1.0 +Release: 1 Group: System/Libraries License: MIT URL: ftp://ftp.freedesktop.org/pub/mesa/demos Sources: - - mesa-demos-%{version}.tar.bz2 - - make-git-snapshot.sh + - http://cgit.freedesktop.org/mesa/demos/snapshot/mesa-demos-%{version}.tar.gz +Patches: + - 0001-GLU-dependency-isn-t-really-needed.patch Description: | Mesa demo utilities PkgBR: - - pkgconfig autoconf automake + - pkgconfig + - autoconf + - automake PkgConfigBR: - gl - glew ++++++ deleted files: --- make-git-snapshot.sh
