OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 28-May-2009 22:51:31
Branch: HEAD Handle: 2009052821513000
Modified files:
openpkg-src/mesa mesa.patch mesa.spec
Log:
upgrading package: mesa 7.0.4 -> 7.4.2
Summary:
Revision Changes Path
1.8 +8 -8 openpkg-src/mesa/mesa.patch
1.32 +2 -30 openpkg-src/mesa/mesa.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mesa/mesa.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 mesa.patch
--- openpkg-src/mesa/mesa.patch 4 Aug 2007 18:29:52 -0000 1.7
+++ openpkg-src/mesa/mesa.patch 28 May 2009 20:51:30 -0000 1.8
@@ -1,20 +1,20 @@
Index: configs/default
---- configs/default.orig 2007-08-01 23:49:59 +0200
-+++ configs/default 2007-08-04 20:14:00 +0200
-@@ -23,8 +23,8 @@
- GLU_CFLAGS =
-
+--- configs/default.orig 2009-05-14 21:19:17 +0200
++++ configs/default 2009-05-28 19:52:00 +0200
+@@ -27,8 +27,8 @@
# Misc tools and flags
+ SHELL = /bin/sh
+ MKLIB = $(SHELL) $(TOP)/bin/mklib
-MKLIB_OPTIONS =
-MKDEP = makedepend
+MKLIB_OPTIONS = -static
+MKDEP = @l_x11bindir@/makedepend
MKDEP_OPTIONS = -fdepend
MAKE = make
- INSTALL = $(TOP)/bin/minstall
+ INSTALL = $(SHELL) $(TOP)/bin/minstall
Index: src/glut/glx/glut_event.c
---- src/glut/glx/glut_event.c.orig 2007-08-01 23:50:00 +0200
-+++ src/glut/glx/glut_event.c 2007-08-04 20:17:45 +0200
+--- src/glut/glx/glut_event.c.orig 2009-03-13 04:28:49 +0100
++++ src/glut/glx/glut_event.c 2009-05-28 19:52:00 +0200
@@ -24,7 +24,7 @@
# ifdef __sgi
# include <bstring.h> /* prototype for bzero used by FD_ZERO */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mesa/mesa.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 mesa.spec
--- openpkg-src/mesa/mesa.spec 18 Apr 2009 13:12:43 -0000 1.31
+++ openpkg-src/mesa/mesa.spec 28 May 2009 20:51:30 -0000 1.32
@@ -31,18 +31,13 @@
Class: EVAL
Group: XWindow
License: LGPL
-Version: 7.0.4
-Release: 20080820
-
-# package options
-%option with_demos no
+Version: 7.4.2
+Release: 20090528
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
Source1:
http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaGLUT-%{version}.tar.bz2
-Source2:
http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
Patch0: mesa.patch
-Patch1: mesa.patch.demos
# build information
Prefix: %{l_prefix}
@@ -70,21 +65,11 @@
url = http://prdownloads.sourceforge.net/mesa3d/
regex = MesaGLUT-(7\.\d+(?:\.\d+)?)\.tar\.bz2
}
- prog mesa:MesaDemos = {
- version = %{version}
- url = http://prdownloads.sourceforge.net/mesa3d/
- regex = MesaDemos-(7\.\d+(?:\.\d+)?)\.tar\.bz2
- }
%prep
%setup -q -n Mesa-%{version}
%setup -q -n Mesa-%{version} -T -D -b 1
%patch -p0
-%if "%{with_demos}" == "yes"
- %setup -q -n Mesa-%{version} -T -D -b 2
- chmod 644 progs/demos/glslnoise.c
- %patch -p0 -P 1
-%endif
%{l_shtool} subst \
-e "s;@l_x11bindir@;`%{l_rc} --query x11_bindir`;g" \
configs/default
@@ -119,19 +104,6 @@
lib/* $RPM_BUILD_ROOT%{l_prefix}/lib/
%{l_shtool} install -c -m 644 \
include/GL/*.h $RPM_BUILD_ROOT%{l_prefix}/include/GL/
-%if "%{with_demos}" == "yes"
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos \
- $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images
- %{l_shtool} install -s -c -m 755 \
- `find progs/demos/ -type f -prune -perm 755 -print` \
- `find progs/redbook/ -type f -prune -perm 755 -print` \
- `find progs/samples/ -type f -prune -perm 755 -print` \
- `find progs/xdemos/ -type f -prune -perm 755 -print` \
- $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos/
- %{l_shtool} install -c -m 644 \
- progs/images/* $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images/
-%endif
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
