1.1 --- a/mesa/mesa.spec Wed Feb 08 20:18:10 2012 +0200
1.2 +++ b/mesa/mesa.spec Wed Feb 08 20:18:30 2012 +0200
1.3 @@ -1,6 +1,6 @@
1.4 ##
1.5 ## mesa.spec -- OpenPKG RPM Package Specification
1.6 -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
1.7 +## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
1.8 ##
1.9 ## Permission to use, copy, modify, and distribute this software for
1.10 ## any purpose with or without fee is hereby granted, provided that
1.11 @@ -31,26 +31,19 @@
1.12 Class: EVAL
1.13 Group: XWindow
1.14 License: LGPL
1.15 -Version: 7.2
1.16 -Release: 20090106
1.17 -
1.18 -# package options
1.19 -%option with_demos no
1.20 +Version: 7.4.4
1.21 +Release: 20101008
1.22
1.23 # list of sources
1.24 Source0: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
1.25 Source1: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaGLUT-%{version}.tar.bz2
1.26 -Source2: http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
1.27 Patch0: mesa.patch
1.28
1.29 # build information
1.30 Prefix: %{l_prefix}
1.31 BuildRoot: %{l_buildroot}
1.32 -BuildPreReq: OpenPKG, openpkg >= 20040130
1.33 -PreReq: OpenPKG, openpkg >= 20040130
1.34 -BuildPreReq: make, gcc, gcc::with_cxx = yes, autoconf, binutils
1.35 -BuildPreReq: X11
1.36 -PreReq: X11
1.37 +BuildPreReq: OpenPKG, openpkg >= 20040130, X11, gcc, make, autoconf
1.38 +PreReq: OpenPKG, openpkg >= 20040130, X11
1.39 AutoReq: no
1.40 AutoReqProv: no
1.41
1.42 @@ -64,54 +57,25 @@
1.43 %track
1.44 prog mesa:MesaLib = {
1.45 version = %{version}
1.46 - url = http://prdownloads.sourceforge.net/mesa3d/
1.47 + url = http://sourceforge.net/projects/mesa3d/files/
1.48 regex = MesaLib-(7\.\d+(?:\.\d+)?)\.tar\.bz2
1.49 }
1.50 prog mesa:MesaGLUT = {
1.51 version = %{version}
1.52 - url = http://prdownloads.sourceforge.net/mesa3d/
1.53 + url = http://sourceforge.net/projects/mesa3d/files/
1.54 regex = MesaGLUT-(7\.\d+(?:\.\d+)?)\.tar\.bz2
1.55 }
1.56 - prog mesa:MesaDemos = {
1.57 - version = %{version}
1.58 - url = http://prdownloads.sourceforge.net/mesa3d/
1.59 - regex = MesaDemos-(7\.\d+(?:\.\d+)?)\.tar\.bz2
1.60 - }
1.61
1.62 %prep
1.63 - # announce exceptional build requirements
1.64 - ( echo "This package has exceptional storage requirements:"
1.65 - echo " mesa-%{version}-root (500 Mo)"
1.66 - echo " Mesa-%{version} (3,5 Go)"
1.67 - echo " mesa-%{version}-<date>.<arch>-<os>-<tag>.rpm (200 Mo)"
1.68 - ) | %{l_rpmtool} msg -b -t notice
1.69 -
1.70 %setup -q -n Mesa-%{version}
1.71 %setup -q -n Mesa-%{version} -T -D -b 1
1.72 %patch -p0
1.73 -%if "%{with_demos}" == "yes"
1.74 - %setup -q -n Mesa-%{version} -T -D -b 2
1.75 -%endif
1.76 %{l_shtool} subst \
1.77 -e "s;@l_x11bindir@;`%{l_rc} --query x11_bindir`;g" \
1.78 configs/default
1.79 %{l_shtool} subst \
1.80 - -e "s;^\(CC\ \ *=\).*;\1 %{l_cc};" \
1.81 - -e "s;^\(CXX\ \ *=\).*;\1 %{l_cxx};" \
1.82 - -e "s;^\(CFLAGS\ \ *=\)\(.*\);\1 %{l_cflags -O}\2;" \
1.83 - -e "s;^\(CXXFLAGS\ \ *=\)\(.*\);\1 %{l_cxxflags -O}\2;" \
1.84 - -e "s;^\(CPPFLAGS\ \ *=\)\(.*\);\1 %{l_cppflags}\2;" \
1.85 - -e "s;^\(LDFLAGS\ \ *=\)\(.*\);\1 %{l_ldflags}\2;" \
1.86 - configs/*
1.87 - %{l_shtool} subst \
1.88 - -e 's;^\(EXTRA_LIB_PATH\ *=.*\);\1 -L$(X11LIB_DIR);' \
1.89 - configs/*
1.90 - %{l_shtool} subst \
1.91 - -e "s;\.\./images/;%{l_prefix}/lib/mesa/images/;" \
1.92 - `find . -name '*.c' -o -name '*.cxx'`
1.93 - %{l_shtool} subst \
1.94 - -e 's;\(APP_LIB_DEPS *=.*-l\$(GL_LIB)\);\1 -lstdc++;' \
1.95 - configs/*
1.96 + -e 's;\(PIC_FLAGS =\).*;\1 -fPIC;' \
1.97 + configs/linux-*
1.98
1.99 %build
1.100 case "%{l_platform -t}" in
1.101 @@ -123,44 +87,16 @@
1.102 *-sunos* ) plat="sunos5-gcc" ;;
1.103 * ) echo "platform %{l_platform -t} not supported" 2>&1; exit 1; ;;
1.104 esac
1.105 -
1.106 - # begin building broken mesa build logic
1.107 - ( cd configs && rm -f current && ln -s $plat current )
1.108 - ( cd src
1.109 - CC="%{l_cc}" \
1.110 - CXX="%{l_cxx}" \
1.111 - CFLAGS="%{l_cflags -O}" \
1.112 - CXXFLAGS="%{l_cxxflags -O}" \
1.113 - CPPFLAGS="%{l_cppflags}" \
1.114 - LDFLAGS="%{l_ldflags}" \
1.115 - X11LIB_DIR="`%{l_rc} --query x11_libdir`" \
1.116 - %{l_make} %{l_mflags -O} \
1.117 - SHELL="%{l_bash}"
1.118 - ) || exit $?
1.119 -
1.120 - # correct broken mesa archive logic
1.121 - %{l_shtool} mkdir -f -p -m 755 temphack
1.122 - ( cd temphack
1.123 - %{l_prefix}/bin/ar -x ../src/mesa/libglapi.a
1.124 - %{l_prefix}/bin/ar -x ../src/mesa/libmesa.a
1.125 - %{l_prefix}/bin/ar -d ../lib/libGL.a libglapi.a libmesa.a
1.126 - %{l_prefix}/bin/ar -ru ../lib/libGL.a *.o
1.127 - ) || exit $?
1.128 -
1.129 -%if "%{with_demos}" == "yes"
1.130 - # continue building with corrected mesa library
1.131 - ( cd progs
1.132 - CC="%{l_cc}" \
1.133 - CXX="%{l_cxx}" \
1.134 - CFLAGS="%{l_cflags -O}" \
1.135 - CXXFLAGS="%{l_cxxflags -O}" \
1.136 - CPPFLAGS="%{l_cppflags}" \
1.137 - LDFLAGS="%{l_ldflags}" \
1.138 - X11LIB_DIR="`%{l_rc} --query x11_libdir`" \
1.139 - %{l_make} %{l_mflags -O} \
1.140 - SHELL="%{l_bash}"
1.141 - ) || exit $?
1.142 -%endif
1.143 + CC="%{l_cc}" \
1.144 + CXX="%{l_cxx}" \
1.145 + CFLAGS="%{l_cflags -O}" \
1.146 + CXXFLAGS="%{l_cxxflags -O}" \
1.147 + CPPFLAGS="%{l_cppflags}" \
1.148 + LDFLAGS="%{l_ldflags}" \
1.149 + X11LIB_DIR="`%{l_rc} --query x11_libdir`" \
1.150 + %{l_make} %{l_mflags} \
1.151 + SHELL="%{l_bash}" \
1.152 + $plat
1.153
1.154 %install
1.155 rm -rf $RPM_BUILD_ROOT
1.156 @@ -171,19 +107,6 @@
1.157 lib/* $RPM_BUILD_ROOT%{l_prefix}/lib/
1.158 %{l_shtool} install -c -m 644 \
1.159 include/GL/*.h $RPM_BUILD_ROOT%{l_prefix}/include/GL/
1.160 -%if "%{with_demos}" == "yes"
1.161 - %{l_shtool} mkdir -f -p -m 755 \
1.162 - $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos \
1.163 - $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images
1.164 - %{l_shtool} install -s -c -m 755 \
1.165 - `find progs/demos/ -type f -prune -perm 755 -print` \
1.166 - `find progs/redbook/ -type f -prune -perm 755 -print` \
1.167 - `find progs/samples/ -type f -prune -perm 755 -print` \
1.168 - `find progs/xdemos/ -type f -prune -perm 755 -print` \
1.169 - $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos/
1.170 - %{l_shtool} install -c -m 644 \
1.171 - progs/images/* $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images/
1.172 -%endif
1.173 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
1.174
1.175 %files -f files
