changeset
Import package vendor original specs for necessary manipulations.
Thu, 08 Jan 2009 10:18:50 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 08 Jan 2009 10:18:50 +0100
- changeset 34
- 673ed164f8e5
- parent 33
- fa4856f209c2
- child 35
- f9bd3f5f28c7
Import package vendor original specs for necessary manipulations.
| lsof/lsof.patch | file | annotate | diff | comparison | revisions | |
| lsof/lsof.spec | file | annotate | diff | comparison | revisions | |
| mesa/mesa.patch | file | annotate | diff | comparison | revisions | |
| mesa/mesa.patch.demos | file | annotate | diff | comparison | revisions | |
| mesa/mesa.spec | file | annotate | diff | comparison | revisions |
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/lsof/lsof.patch Thu Jan 08 10:18:50 2009 +0100 1.3 @@ -0,0 +1,183 @@ 1.4 +Index: Configure 1.5 +--- Configure.orig 2008-04-15 15:24:36 +0200 1.6 ++++ Configure 2008-04-16 08:19:20 +0200 1.7 +@@ -413,7 +413,7 @@ 1.8 + fi # } 1.9 + fi # } 1.10 + LSOF_TGT="aix" 1.11 +- echo $LSOF_CC | grep gcc > /dev/null 1.12 ++ $LSOF_CC --version | grep GCC > /dev/null 1.13 + if test $? -eq 0 # { 1.14 + then 1.15 + 1.16 +@@ -567,7 +567,7 @@ 1.17 + 1.18 + rm -f dialects/aix/aix5/j2/j2_snapshot.h 1.19 + fi # } 1.20 +- echo $LSOF_CC | grep gcc > /dev/null 1.21 ++ $LSOF_CC --version | grep GCC > /dev/null 1.22 + if test $? -eq 0 # { 1.23 + then 1.24 + 1.25 +@@ -605,7 +605,7 @@ 1.26 + # This is AIX >= 5 on ia64. 1.27 + 1.28 + LSOF_TSTK64=1 1.29 +- echo $LSOF_CC | grep gcc > /dev/null 1.30 ++ $LSOF_CC --version | grep GCC > /dev/null 1.31 + if test $? -eq 0 # { 1.32 + then 1.33 + 1.34 +@@ -682,7 +682,7 @@ 1.35 + fi # } 1.36 + LSOF_TSTK64=1 1.37 + LSOF_TMP1=1 1.38 +- echo $LSOF_CC | grep gcc > /dev/null 1.39 ++ $LSOF_CC --version | grep GCC > /dev/null 1.40 + if test $? -eq 0 # { 1.41 + then 1.42 + LSOF_CFGF="$LSOF_CFGF -maix64" 1.43 +@@ -729,7 +729,7 @@ 1.44 + fi #} 1.45 + LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" 1.46 + LSOF_DIALECT_DIR=aix 1.47 +- echo $LSOF_CC | grep gcc > /dev/null 1.48 ++ $LSOF_CC --version | grep GCC > /dev/null 1.49 + if test $? -eq 0 # { 1.50 + then 1.51 + 1.52 +@@ -1995,7 +1995,7 @@ 1.53 + fi # } 1.54 + fi # } 1.55 + fi # } 1.56 +- echo $LSOF_CC | grep gcc > /dev/null 1.57 ++ $LSOF_CC --version | grep GCC > /dev/null 1.58 + if test $? -eq 0 # { 1.59 + then 1.60 + LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 1.61 +@@ -2047,7 +2047,7 @@ 1.62 + then 1.63 + LSOF_CFGF="$LSOF_CFGF -Ae +DD32" 1.64 + else 1.65 +- echo $LSOF_CC | grep -q gcc 1.66 ++ $LSOF_CC --version | grep -q GCC 1.67 + if test $? -ne 0 # { 1.68 + then 1.69 + LSOF_CFGF="$LSOF_CFGF +DD32" 1.70 +@@ -2127,7 +2127,7 @@ 1.71 + echo "* NOTICE! Configuring for 64 bit HP-UX *" 1.72 + echo "* *" 1.73 + echo "*****************************************" 1.74 +- echo $LSOF_CC | grep gcc > /dev/null 1.75 ++ $LSOF_CC --version | grep GCC > /dev/null 1.76 + if test $? -eq 0 # { 1.77 + then 1.78 + 1.79 +@@ -2196,7 +2196,7 @@ 1.80 + else 1.81 + LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" 1.82 + LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" 1.83 +- echo $LSOF_CC | grep gcc > /dev/null 1.84 ++ $LSOF_CC --version | grep GCC > /dev/null 1.85 + if test $? -ne 0 # { 1.86 + then 1.87 + LSOF_CFGF="$LSOF_CFGF +DAportable" 1.88 +@@ -3403,7 +3403,7 @@ 1.89 + LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 1.90 + fi # } 1.91 + fi # } 1.92 +- echo $LSOF_CC | grep gcc > /dev/null 1.93 ++ $LSOF_CC --version | grep GCC > /dev/null 1.94 + if test $? -eq 0 # { 1.95 + then 1.96 + LSOF_CFGL="-w" 1.97 +@@ -4040,6 +4040,9 @@ 1.98 + LSOF_TSTBIGF=" " 1.99 + LSOF_TSTLFLG="-lsocket -lnsl" 1.100 + LSOF_VERS="100000" 1.101 ++ if [ ".`isainfo -k`" = .amd64 ]; then 1.102 ++ LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 1.103 ++ fi 1.104 + ;; 1.105 + *) 1.106 + echo Unknown Solaris version: $LSOF_VSTR 1.107 +@@ -4118,7 +4121,7 @@ 1.108 + echo "main(){" >> ${LSOF_TMPC}.c 1.109 + echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c 1.110 + echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" 1.111 +- echo $LSOF_CC | grep gcc > /dev/null 1.112 ++ $LSOF_CC --version | grep GCC > /dev/null 1.113 + if test $? -eq 0 # { 1.114 + then 1.115 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 1.116 +@@ -4143,7 +4146,7 @@ 1.117 + echo "main(){" >> ${LSOF_TMPC}.c 1.118 + echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c 1.119 + echo "Testing prdata.h for PR_LDT, using $LSOF_CC" 1.120 +- echo $LSOF_CC | grep gcc > /dev/null 1.121 ++ $LSOF_CC --version | grep GCC > /dev/null 1.122 + if test $? -eq 0 # { 1.123 + then 1.124 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 1.125 +@@ -4173,7 +4176,7 @@ 1.126 + echo $SOLARIS_KERNBITS | grep 64 > /dev/null 1.127 + if test $? -eq 0 # { 1.128 + then 1.129 +- echo $LSOF_CC | grep gcc > /dev/null 1.130 ++ $LSOF_CC --version | grep GCC > /dev/null 1.131 + if test $? -eq 0 # { 1.132 + then 1.133 + 1.134 +@@ -4377,7 +4380,7 @@ 1.135 + 1.136 + # Check for Solaris 10 or higher ZFS. 1.137 + 1.138 +- if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { 1.139 ++ if false # { 1.140 + then 1.141 + LSOF_TMP1="dmu.h zfs_acl.h zfs_debug.h zfs_rlock.h zil.h spa.h zfs_context.h zfs_dir.h zfs_vfsops.h zio.h txg.h zfs_ctldir.h zfs_ioctl.h zfs_znode.h zio_impl.h" 1.142 + LSOF_TMP2="" 1.143 +@@ -4460,7 +4463,7 @@ 1.144 + echo "main(){" >> ${LSOF_TMPC}.c 1.145 + echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c 1.146 + echo "Testing vnode.h for VSOCK, using $LSOF_CC" 1.147 +- echo $LSOF_CC | grep gcc > /dev/null 1.148 ++ $LSOF_CC --version | grep GCC > /dev/null 1.149 + if test $? -eq 0 # { 1.150 + then 1.151 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 1.152 +@@ -5139,7 +5142,7 @@ 1.153 + echo "$i" >> $LSOF_TSTCFLG 1.154 + done # } 1.155 + fi # } 1.156 +-echo $LSOF_CC | grep gcc > /dev/null 2>&1 1.157 ++$LSOF_CC --version | grep GCC > /dev/null 2>&1 1.158 + if test $? -eq 0 # { 1.159 + then 1.160 + echo "-DLT_GCC" >> $LSOF_TSTCFLG 1.161 +Index: dialects/freebsd/machine.h 1.162 +--- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200 1.163 ++++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200 1.164 +@@ -436,6 +436,11 @@ 1.165 + */ 1.166 + 1.167 + /* #define HASSECURITY 1 */ 1.168 ++#if FREEBSDV>=6000 1.169 ++#define HASSECURITY 1 1.170 ++#define HAS_SI_PRIV 1 1.171 ++#endif /* FREEBSDV>=6000 */ 1.172 ++ 1.173 + 1.174 + 1.175 + /* 1.176 +Index: dialects/sun/machine.h 1.177 +--- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200 1.178 ++++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200 1.179 +@@ -75,6 +75,7 @@ 1.180 + #include <sys/poll.h> 1.181 + 1.182 + # if solaris>=80000 1.183 ++#include <sys/types32.h> 1.184 + #include <sys/wait.h> 1.185 + #include <sys/types32.h> 1.186 + #define _KERNEL 1
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/lsof/lsof.spec Thu Jan 08 10:18:50 2009 +0100 2.3 @@ -0,0 +1,109 @@ 2.4 +## 2.5 +## lsof.spec -- OpenPKG RPM Package Specification 2.6 +## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 2.7 +## 2.8 +## Permission to use, copy, modify, and distribute this software for 2.9 +## any purpose with or without fee is hereby granted, provided that 2.10 +## the above copyright notice and this permission notice appear in all 2.11 +## copies. 2.12 +## 2.13 +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 2.14 +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 2.15 +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 2.16 +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR 2.17 +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 2.18 +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 2.19 +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 2.20 +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 2.21 +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 2.22 +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 2.23 +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 2.24 +## SUCH DAMAGE. 2.25 +## 2.26 + 2.27 +# package information 2.28 +Name: lsof 2.29 +Summary: List Open Files 2.30 +URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ 2.31 +Vendor: Victor A. Abell 2.32 +Packager: OpenPKG Foundation e.V. 2.33 +Distribution: OpenPKG Community 2.34 +Class: BASE 2.35 +Group: Debugging 2.36 +License: BSD 2.37 +Version: 4.81 2.38 +Release: 20081023 2.39 + 2.40 +# list of sources 2.41 +Source0: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz 2.42 +Patch0: lsof.patch 2.43 + 2.44 +# build information 2.45 +Prefix: %{l_prefix} 2.46 +BuildRoot: %{l_buildroot} 2.47 +BuildPreReq: OpenPKG, openpkg >= 20040130, gcc 2.48 +PreReq: OpenPKG, openpkg >= 20040130 2.49 +AutoReq: no 2.50 +AutoReqProv: no 2.51 + 2.52 +%description 2.53 + List Open Files (lsof) shows all currently open file descriptors of 2.54 + processes. 2.55 + 2.56 +%track 2.57 + prog lsof = { 2.58 + version = %{version} 2.59 + url = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ 2.60 + regex = lsof_(__VER__)\.tar\.gz 2.61 + } 2.62 + 2.63 +%prep 2.64 + %setup -q -n lsof_%{version} 2.65 + %{l_tar} xf lsof_%{version}_src.tar 2.66 + cd lsof_%{version}_src 2.67 + %patch -p0 2.68 + 2.69 +%build 2.70 + cd lsof_%{version}_src 2.71 + export PATH="/bin:/usr/bin:$PATH" 2.72 + export LSOF_CC="%{l_cc}" 2.73 + export LSOF_MAKE="%{l_make} %{l_mflags}" 2.74 + case "%{l_platform -t}" in 2.75 + *-freebsd* ) platform="freebsd"; LSOF_CC="/usr/bin/cc"; LSOF_MAKE="/usr/bin/make" ;; 2.76 + *-linux* ) platform="linux" ;; 2.77 + *-sunos* ) platform="solaris" ;; 2.78 + *-netbsd* ) platform="netbsd" ;; 2.79 + *-hpux* ) platform="hpuxgcc" ;; 2.80 + *-aix* ) platform="aixgcc" ;; 2.81 + * ) echo "Platform %{l_platform -t} not supported" 1>&2; exit 1 ;; 2.82 + esac 2.83 + ./Configure -n $platform 2.84 + eval $LSOF_MAKE 2.85 + 2.86 +%install 2.87 + rm -rf $RPM_BUILD_ROOT 2.88 + %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin 2.89 + %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man8 2.90 + ( cd lsof_%{version}_src 2.91 + %{l_shtool} install -c lsof $RPM_BUILD_ROOT%{l_prefix}/bin/ 2.92 + %{l_shtool} install -c lsof.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/ 2.93 + ) || exit $? 2.94 + strip $RPM_BUILD_ROOT%{l_prefix}/bin/lsof >/dev/null 2>&1 || true 2.95 + setgid="" 2.96 + case "%{l_platform -t}" in 2.97 + *-freebsd* ) setgid="kmem" ;; 2.98 + *-linux* ) setgid="kmem" ;; 2.99 + *-sunos* ) setgid="sys" ;; 2.100 + *-netbsd* ) setgid="kmem" ;; 2.101 + *-hpux* ) setgid="sys" ;; 2.102 + *-aix* ) setgid="sys" ;; 2.103 + esac 2.104 + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ 2.105 + %{l_files_std} \ 2.106 + "%attr(2755,%{l_musr},$setgid) %{l_prefix}/bin/lsof" 2.107 + 2.108 +%files -f files 2.109 + 2.110 +%clean 2.111 + rm -rf $RPM_BUILD_ROOT 2.112 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/mesa/mesa.patch Thu Jan 08 10:18:50 2009 +0100 3.3 @@ -0,0 +1,26 @@ 3.4 +Index: configs/default 3.5 +--- src/glut/glx/glut_event.c.orig 2008-11-26 19:10:59.000000000 +0100 3.6 ++++ src/glut/glx/glut_event.c 2008-11-26 19:11:40.000000000 +0100 3.7 +@@ -24,7 +24,7 @@ 3.8 + # ifdef __sgi 3.9 + # include <bstring.h> /* prototype for bzero used by FD_ZERO */ 3.10 + # endif 3.11 +-# if (defined(__FreeBSD__) || defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE) 3.12 ++# if (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE) 3.13 + # include <sys/select.h> /* select system call interface */ 3.14 + # ifdef luna 3.15 + # include <sysent.h> 3.16 +Index: src/glut/glx/glut_event.c 3.17 +--- configs/default.orig 2008-11-26 19:08:51.000000000 +0100 3.18 ++++ configs/default 2008-11-26 19:09:33.000000000 +0100 3.19 +@@ -27,8 +27,8 @@ 3.20 + # Misc tools and flags 3.21 + SHELL = /bin/sh 3.22 + MKLIB = $(SHELL) $(TOP)/bin/mklib 3.23 +-MKLIB_OPTIONS = 3.24 +-MKDEP = makedepend 3.25 ++MKLIB_OPTIONS = -static 3.26 ++MKDEP = @l_x11bindir@/makedepend 3.27 + MKDEP_OPTIONS = -fdepend 3.28 + MAKE = make 3.29 + INSTALL = $(SHELL) $(TOP)/bin/minstall
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/mesa/mesa.patch.demos Thu Jan 08 10:18:50 2009 +0100 4.3 @@ -0,0 +1,79 @@ 4.4 +Index: progs/demos/Makefile 4.5 +diff -Nau progs/demos/Makefile.orig progs/demos/Makefile 4.6 +--- progs/demos/Makefile.orig 2008-08-25 16:46:41.000000000 +0200 4.7 ++++ progs/demos/Makefile 2008-11-26 21:42:37.000000000 +0100 4.8 +@@ -5,17 +5,17 @@ 4.9 + 4.10 + INCDIR = $(TOP)/include 4.11 + 4.12 +-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) 4.13 ++OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS) 4.14 + 4.15 +-OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) 4.16 ++OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS) 4.17 + 4.18 +-OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) 4.19 ++OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS) 4.20 + 4.21 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ 4.22 + $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) 4.23 + 4.24 + LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ 4.25 +- $(APP_LIB_DEPS) 4.26 ++ $(GLUT_LIB_DEPS) 4.27 + 4.28 + PROGS = \ 4.29 + arbfplight \ 4.30 +@@ -125,14 +125,14 @@ 4.31 + 4.32 + 4.33 + reflect: reflect.o showbuffer.o readtex.o 4.34 +- $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ 4.35 ++ $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@ 4.36 + 4.37 + reflect.o: reflect.c showbuffer.h 4.38 + $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c 4.39 + 4.40 + 4.41 + shadowtex: shadowtex.o showbuffer.o 4.42 +- $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ 4.43 ++ $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@ 4.44 + 4.45 + shadowtex.o: shadowtex.c showbuffer.h 4.46 + $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c 4.47 +Index: progs/samples/Makefile 4.48 +diff -Nau progs/samples/Makefile.orig progs/samples/Makefile 4.49 +--- progs/samples/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 4.50 ++++ progs/samples/Makefile 2008-11-26 21:46:18.000000000 +0100 4.51 +@@ -7,7 +7,7 @@ 4.52 + 4.53 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) 4.54 + 4.55 +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) 4.56 ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS) 4.57 + 4.58 + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ 4.59 + font line logo nurb olympic overlay point prim quad select \ 4.60 +@@ -28,6 +28,9 @@ 4.61 + default: $(PROGS) 4.62 + 4.63 + 4.64 ++nurb: nurb.c 4.65 ++ $(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@ 4.66 ++ 4.67 + sphere: sphere.o readtex.o 4.68 + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@ 4.69 + 4.70 +Index: progs/xdemos/Makefile 4.71 +diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile 4.72 +--- progs/xdemos/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 4.73 ++++ progs/xdemos/Makefile 2008-11-26 21:48:28.000000000 +0100 4.74 +@@ -8,7 +8,7 @@ 4.75 + 4.76 + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) 4.77 + 4.78 +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) 4.79 ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS) 4.80 + 4.81 + PROGS = \ 4.82 + corender \
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/mesa/mesa.spec Thu Jan 08 10:18:50 2009 +0100 5.3 @@ -0,0 +1,189 @@ 5.4 +## 5.5 +## mesa.spec -- OpenPKG RPM Package Specification 5.6 +## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> 5.7 +## 5.8 +## Permission to use, copy, modify, and distribute this software for 5.9 +## any purpose with or without fee is hereby granted, provided that 5.10 +## the above copyright notice and this permission notice appear in all 5.11 +## copies. 5.12 +## 5.13 +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 5.14 +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 5.15 +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 5.16 +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR 5.17 +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 5.18 +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 5.19 +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 5.20 +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 5.21 +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 5.22 +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT 5.23 +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 5.24 +## SUCH DAMAGE. 5.25 +## 5.26 + 5.27 +# package information 5.28 +Name: mesa 5.29 +Summary: OpenGL Toolkit 5.30 +URL: http://www.mesa3d.org/ 5.31 +Vendor: Brian Paul 5.32 +Packager: OpenPKG Foundation e.V. 5.33 +Distribution: OpenPKG Community 5.34 +Class: EVAL 5.35 +Group: XWindow 5.36 +License: LGPL 5.37 +Version: 7.2 5.38 +Release: 20081126 5.39 + 5.40 +# package options 5.41 +%option with_demos no 5.42 + 5.43 +# list of sources 5.44 +Source0: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2 5.45 +Source1: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaGLUT-%{version}.tar.bz2 5.46 +Source2: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2 5.47 +Patch0: mesa.patch 5.48 + 5.49 +# build information 5.50 +Prefix: %{l_prefix} 5.51 +BuildRoot: %{l_buildroot} 5.52 +BuildPreReq: OpenPKG, openpkg >= 20040130 5.53 +PreReq: OpenPKG, openpkg >= 20040130 5.54 +BuildPreReq: X11, gcc, make, autoconf, binutils 5.55 +PreReq: X11 5.56 +AutoReq: no 5.57 +AutoReqProv: no 5.58 + 5.59 +%description 5.60 + Mesa is a full-featured 3D graphics rendering library providing the 5.61 + official OpenGL 2.0 and OpenGL 2.1 APIs. A variety of device drivers 5.62 + allow Mesa to be used in many different environments ranging from 5.63 + software emulation to complete hardware acceleration for modern 5.64 + GPUs. 5.65 + 5.66 +%track 5.67 + prog mesa:MesaLib = { 5.68 + version = %{version} 5.69 + url = http://prdownloads.sourceforge.net/mesa3d/ 5.70 + regex = MesaLib-(7\.\d+(?:\.\d+)?)\.tar\.bz2 5.71 + } 5.72 + prog mesa:MesaGLUT = { 5.73 + version = %{version} 5.74 + url = http://prdownloads.sourceforge.net/mesa3d/ 5.75 + regex = MesaGLUT-(7\.\d+(?:\.\d+)?)\.tar\.bz2 5.76 + } 5.77 + prog mesa:MesaDemos = { 5.78 + version = %{version} 5.79 + url = http://prdownloads.sourceforge.net/mesa3d/ 5.80 + regex = MesaDemos-(7\.\d+(?:\.\d+)?)\.tar\.bz2 5.81 + } 5.82 + 5.83 +%prep 5.84 + # announce exceptional build requirements 5.85 + ( echo "This package has exceptional storage requirements:" 5.86 + echo " mesa-%{version}-root (500 Mo)" 5.87 + echo " Mesa-%{version} (3,5 Go)" 5.88 + echo " mesa-%{version}-<date>.<arch>-<os>-<tag>.rpm (200 Mo)" 5.89 + ) | %{l_rpmtool} msg -b -t notice 5.90 + 5.91 + %setup -q -n Mesa-%{version} 5.92 + %setup -q -n Mesa-%{version} -T -D -b 1 5.93 + %patch -p0 5.94 +%if "%{with_demos}" == "yes" 5.95 + %setup -q -n Mesa-%{version} -T -D -b 2 5.96 +%endif 5.97 + %{l_shtool} subst \ 5.98 + -e "s;@l_x11bindir@;`%{l_rc} --query x11_bindir`;g" \ 5.99 + configs/default 5.100 + %{l_shtool} subst \ 5.101 + -e "s;^\(CC\ \ *=\).*;\1 %{l_cc};" \ 5.102 + -e "s;^\(CXX\ \ *=\).*;\1 %{l_cxx};" \ 5.103 + -e "s;^\(CFLAGS\ \ *=\)\(.*\);\1 %{l_cflags -O}\2;" \ 5.104 + -e "s;^\(CXXFLAGS\ \ *=\)\(.*\);\1 %{l_cxxflags -O}\2;" \ 5.105 + -e "s;^\(CPPFLAGS\ \ *=\)\(.*\);\1 %{l_cppflags}\2;" \ 5.106 + -e "s;^\(LDFLAGS\ \ *=\)\(.*\);\1 %{l_ldflags}\2;" \ 5.107 + configs/* 5.108 + %{l_shtool} subst \ 5.109 + -e 's;^\(EXTRA_LIB_PATH\ *=.*\);\1 -L$(X11LIB_DIR);' \ 5.110 + configs/* 5.111 + %{l_shtool} subst \ 5.112 + -e "s;\.\./images/;%{l_prefix}/lib/mesa/images/;" \ 5.113 + `find . -name '*.c' -or -name '*.cxx'` 5.114 + 5.115 +%build 5.116 + case "%{l_platform -t}" in 5.117 + *-freebsd* ) plat="freebsd" ;; 5.118 + *-netbsd* ) plat="netbsd" ;; 5.119 + i?86*-linux* ) plat="linux-x86-static" ;; 5.120 + *-linux* ) plat="linux-static" ;; 5.121 + i?86*-sunos* ) plat="solaris-x86-gcc" ;; 5.122 + *-sunos* ) plat="sunos5-gcc" ;; 5.123 + * ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1; ;; 5.124 + esac 5.125 + 5.126 + # begin building broken mesa build logic 5.127 + ( cd configs && rm -f current && ln -s $plat current ) 5.128 + ( cd src 5.129 + CC="%{l_cc}" \ 5.130 + CXX="%{l_cxx}" \ 5.131 + CFLAGS="%{l_cflags -O}" \ 5.132 + CXXFLAGS="%{l_cxxflags -O}" \ 5.133 + CPPFLAGS="%{l_cppflags}" \ 5.134 + LDFLAGS="%{l_ldflags}" \ 5.135 + X11LIB_DIR="`%{l_rc} --query x11_libdir`" \ 5.136 + %{l_make} %{l_mflags -O} \ 5.137 + SHELL="%{l_bash}" 5.138 + ) || exit $? 5.139 + 5.140 + # correct broken mesa archive logic 5.141 + %{l_shtool} mkdir -f -p -m 755 temphack 5.142 + ( cd temphack 5.143 + %{l_prefix}/bin/ar -x ../src/mesa/libglapi.a 5.144 + %{l_prefix}/bin/ar -x ../src/mesa/libmesa.a 5.145 + %{l_prefix}/bin/ar -d ../lib/libGL.a libglapi.a libmesa.a 5.146 + %{l_prefix}/bin/ar -ru ../lib/libGL.a *.o 5.147 + ) || exit $? 5.148 + 5.149 +%if "%{with_demos}" == "yes" 5.150 + # continue building with corrected mesa library 5.151 + ( cd progs 5.152 + CC="%{l_cc}" \ 5.153 + CXX="%{l_cxx}" \ 5.154 + CFLAGS="%{l_cflags -O}" \ 5.155 + CXXFLAGS="%{l_cxxflags -O}" \ 5.156 + CPPFLAGS="%{l_cppflags}" \ 5.157 + LDFLAGS="%{l_ldflags}" \ 5.158 + X11LIB_DIR="`%{l_rc} --query x11_libdir`" \ 5.159 + %{l_make} %{l_mflags -O} \ 5.160 + SHELL="%{l_bash}" 5.161 + ) || exit $? 5.162 +%endif 5.163 + 5.164 +%install 5.165 + rm -rf $RPM_BUILD_ROOT 5.166 + %{l_shtool} mkdir -f -p -m 755 \ 5.167 + $RPM_BUILD_ROOT%{l_prefix}/lib \ 5.168 + $RPM_BUILD_ROOT%{l_prefix}/include/GL 5.169 + %{l_shtool} install -c -m 644 \ 5.170 + lib/* $RPM_BUILD_ROOT%{l_prefix}/lib/ 5.171 + %{l_shtool} install -c -m 644 \ 5.172 + include/GL/*.h $RPM_BUILD_ROOT%{l_prefix}/include/GL/ 5.173 +%if "%{with_demos}" == "yes" 5.174 + %{l_shtool} mkdir -f -p -m 755 \ 5.175 + $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos \ 5.176 + $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images 5.177 + %{l_shtool} install -s -c -m 755 \ 5.178 + `find progs/demos/ -type f -prune -perm 755 -print` \ 5.179 + `find progs/redbook/ -type f -prune -perm 755 -print` \ 5.180 + `find progs/samples/ -type f -prune -perm 755 -print` \ 5.181 + `find progs/xdemos/ -type f -prune -perm 755 -print` \ 5.182 + $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos/ 5.183 + %{l_shtool} install -c -m 644 \ 5.184 + progs/images/* $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images/ 5.185 +%endif 5.186 + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 5.187 + 5.188 +%files -f files 5.189 + 5.190 +%clean 5.191 + rm -rf $RPM_BUILD_ROOT 5.192 +
