[SM-Commit] GIT changes to stable-0.48 grimoire by George Sherwood (9d1f0544bc27294488c1e247da1bbef737f1df99)

George Sherwood scm at sourcemage.org
Sat Oct 9 11:04:06 EDT 2010


GIT changes to stable-0.48 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 graphics/mesademos/DETAILS     |    1 +
 graphics/mesademos/HISTORY     |    8 ++++++++
 graphics/mesademos/PRE_BUILD   |    8 ++++++++
 graphics/mesademos/UP_TRIGGERS |    7 +++++++
 graphics/mesademos/clear.patch |   21 +++++++++++++++++++++
 graphics/mesademos/egl.patch   |   11 +++++++++++
 6 files changed, 56 insertions(+)

New commits:
commit 9d1f0544bc27294488c1e247da1bbef737f1df99
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mesademos: Rename mesademo's clear as clear-gl (Bug #15785)
    PATCHLEVEL++
    Trigger an ncurses build *after* mesademos if mesademos
    is providing /usr/bin/clear
    
    This is to avoid ncurses casting and installing the proper
    /usr/bin/clear, then mesademos casting and *removing* what it thinks is
    its /usr/bin/clear (and installing /usr/bin/clear-gl), and the user now
    having no /usr/bin/clear (a `cleanse --fix` would fix this, but we
    shouldn't expect our users to do this except when things are really
    broken).
    (cherry picked from commit 7b1415ebc5dfbbc4e672af78bf9a62cd78067b8e)

commit 1b83363de2942dad1a7ef9bf20cd199eadc35849
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    mesademos: Disable building egl
    
    Making all in opengl
    make[3]: Entering directory `/usr/src/mesa-demos-8.0.1/src/egl/opengl'
      CCLD   xeglgears
    xeglgears.o: In function `.L153':
    xeglgears.c:(.text+0x2474): undefined reference to
    `glEGLImageTargetTexture2DOES'
    collect2: ld returned 1 exit status
    make[3]: *** [xeglgears] Error 1
    (cherry picked from commit 09c9e98c6d7e2610c4f3fd14c2241e731f2b1d9e)

diff --git a/graphics/mesademos/DETAILS b/graphics/mesademos/DETAILS
index e2fa232..7a5f409 100755
--- a/graphics/mesademos/DETAILS
+++ b/graphics/mesademos/DETAILS
@@ -5,6 +5,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/mesa-demos-$VERSION
    SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/demos/$VERSION/$SOURCE
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         WEB_SITE=http://www.mesa3d.org
         KEYWORDS="graphics"
          ENTERED=20021120
diff --git a/graphics/mesademos/HISTORY b/graphics/mesademos/HISTORY
index 6a75e2a..0852ad8 100644
--- a/graphics/mesademos/HISTORY
+++ b/graphics/mesademos/HISTORY
@@ -1,3 +1,11 @@
+2010-10-06 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply egl.patch and clear.patch
+	* egl.patch: Disable building egl
+	* clear.patch: Rename mesademo's clear as clear-gl (Bug #15785)
+	* UP_TRIGGERS: Trigger an ncurses build *after* mesademos if mesademos
+	  is providing /usr/bin/clear
+
 2010-07-29 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 8.0.1, mesademos is now a standalone project
 	* BUILD, INSTALL, PRE_BUILD: removed
diff --git a/graphics/mesademos/PRE_BUILD b/graphics/mesademos/PRE_BUILD
new file mode 100755
index 0000000..b795112
--- /dev/null
+++ b/graphics/mesademos/PRE_BUILD
@@ -0,0 +1,8 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+message "${MESSAGE_COLOR}Apply duplicate /usr/bin/clear patch...${DEFAULT_COLOR}" &&
+patch -p1 < "$SPELL_DIRECTORY"/clear.patch
+
+message "${MESSAGE_COLOR}Disable egl...${DEFAULT_COLOR}" &&
+patch -p1 < "$SPELL_DIRECTORY"/egl.patch
diff --git a/graphics/mesademos/UP_TRIGGERS b/graphics/mesademos/UP_TRIGGERS
new file mode 100755
index 0000000..e1d5dfe
--- /dev/null
+++ b/graphics/mesademos/UP_TRIGGERS
@@ -0,0 +1,7 @@
+#
+# Fix conflicting installer of /usr/bin/clear (Bug #15785)
+# Leave in until stable-0.49, then remove
+#
+if $(gaze from $INSTALL_ROOT/usr/bin/clear|cut -d: -f1|grep -q mesademos); then
+	up_trigger ncurses cast_self
+fi
diff --git a/graphics/mesademos/clear.patch b/graphics/mesademos/clear.patch
new file mode 100644
index 0000000..ee989a5
--- /dev/null
+++ b/graphics/mesademos/clear.patch
@@ -0,0 +1,21 @@
+diff -Naur mesa-demos-8.0.1.orig/src/trivial/Makefile.in mesa-demos-8.0.1/src/trivial/Makefile.in
+--- mesa-demos-8.0.1.orig/src/trivial/Makefile.in	2010-10-06 17:09:29.101000005 -0700
++++ mesa-demos-8.0.1/src/trivial/Makefile.in	2010-10-06 17:13:24.339001231 -0700
+@@ -58,7 +58,7 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+- at HAVE_GLUT_TRUE@bin_PROGRAMS = clear$(EXEEXT) clear-fbo$(EXEEXT) \
++ at HAVE_GLUT_TRUE@bin_PROGRAMS = clear-gl$(EXEEXT) clear-fbo$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	clear-fbo-tex$(EXEEXT) clear-random$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	clear-repeat$(EXEEXT) clear-scissor$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	clear-undefined$(EXEEXT) createwin$(EXEEXT) \
+@@ -1001,7 +1001,7 @@
+ 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ 	echo " rm -f" $$list; \
+ 	rm -f $$list
+-clear$(EXEEXT): $(clear_OBJECTS) $(clear_DEPENDENCIES) 
++clear-gl$(EXEEXT): $(clear_OBJECTS) $(clear_DEPENDENCIES) 
+ 	@rm -f clear$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(clear_OBJECTS) $(clear_LDADD) $(LIBS)
+ clear-fbo$(EXEEXT): $(clear_fbo_OBJECTS) $(clear_fbo_DEPENDENCIES) 
diff --git a/graphics/mesademos/egl.patch b/graphics/mesademos/egl.patch
new file mode 100644
index 0000000..d6f4e52
--- /dev/null
+++ b/graphics/mesademos/egl.patch
@@ -0,0 +1,11 @@
+diff -Naur mesa-demos-8.0.1.orig/src/Makefile.in mesa-demos-8.0.1/src/Makefile.in
+--- mesa-demos-8.0.1.orig/src/Makefile.in	2010-10-06 17:09:29.089000005 -0700
++++ mesa-demos-8.0.1/src/Makefile.in	2010-10-06 17:22:00.806000001 -0700
+@@ -261,7 +261,6 @@
+ SUBDIRS = \
+ 	util \
+ 	demos \
+-	egl \
+ 	fp \
+ 	fpglsl \
+ 	glsl \



More information about the SM-Commit mailing list