auto-import mesa-libGLw-6.5.1-0.2 on branch devel from

mesa-libGLw-6.5.1-0.2.src.rpm
2006-09-29 16:30:53 +00:00 · 2006-09-29 16:30:53 +00:00 · 7d72622579
commit 7d72622579
parent a3a6ca61ec
5 changed files with 171 additions and 0 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -0,0 +1 @@
+MesaLib-6.5.1.tar.bz2
--- a/mesa-6.5-build-config.patch
+++ b/mesa-6.5-build-config.patch
@ -0,0 +1,12 @@
+--- ./configs/linux.build-config	2006-04-03 18:13:19.000000000 -0400
+++ ./configs/linux	2006-04-03 18:13:47.000000000 -0400
+@@ -8,6 +8,9 @@
+ CC = gcc
+ CXX = g++
+ 
+MKDEP = gcc -M -MG
+MKDEP_OPTIONS = -MF depend
+
+ OPT_FLAGS  = -O3 -g
+ PIC_FLAGS  = -fPIC
+ 
--- a/mesa-6.5.1-libGLw.patch
+++ b/mesa-6.5.1-libGLw.patch
@ -0,0 +1,31 @@
+--- Mesa-6.5.1/configs/default.motif	2006-09-11 17:35:46.000000000 -0400
+++ Mesa-6.5.1/configs/default	2006-09-19 11:41:44.000000000 -0400
+@@ -55,16 +55,16 @@
+ 
+ # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
+ # order to build the Motif widget too)
+-GLW_SOURCES = GLwDrawA.c
+GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
+ 
+ 
+ # Directories to build
+ LIB_DIR = lib
+-SRC_DIRS = mesa glu glut/glx glw
+SRC_DIRS = glw
+ GLU_DIRS = sgi
+ DRIVER_DIRS = x11 osmesa
+ # Which subdirs under $(TOP)/progs/ to enter:
+-PROGRAM_DIRS = demos redbook samples xdemos
+PROGRAM_DIRS = 
+ 
+ 
+ # Library/program dependencies
+@@ -73,7 +73,7 @@
+ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm $(EXTRA_LIB_PATH) -lXt -lX11
+ APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+ 
+ 
--- a/mesa-libGLw.spec
+++ b/mesa-libGLw.spec
@ -0,0 +1,126 @@
+# Bit of a kludge to get libGLw built independently of Mesa.
+# Joyfully stolen from the mesa-6.5 spec file.
+
+Summary: Xt / Motif OpenGL widgets
+Name: mesa-libGLw
+Version: 6.5.1
+Release: 0.2%{?dist}
+License: MIT/X11
+Group: System Environment/Libraries
+URL: http://www.mesa3d.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
+Patch0: mesa-6.5-build-config.patch
+Patch1: mesa-6.5.1-libGLw.patch
+
+BuildRequires: pkgconfig
+BuildRequires: libXt-devel
+BuildRequires: libGL-devel
+BuildRequires: lesstif-devel
+
+%description
+Mesa libGLw runtime library
+
+Provides: libGLw
+# libGLw used to be in Mesa package in RHL 6.x, 7.[0-2], RHEL 2.1
+Obsoletes: Mesa
+# libGLw moved to XFree86-libs for RHL 7.3, 8, 9, FC1, RHEL 3
+Obsoletes: XFree86-libs
+# libGLw moved to xorg-x11-libs FC[2-4], RHEL4
+Obsoletes: xorg-x11-libs
+
+%package devel
+Summary: Mesa libGLw development package
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libGL-devel
+Provides: libGLw-devel
+
+%description devel
+Mesa libGLw development package
+
+#-- prep -------------------------------------------------------------
+%prep
+%setup -q -n Mesa-%{version}
+
+%patch0 -p0 -b .build-config
+%patch1 -p1 -b .motif
+
+# WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
+# license and are not free software (but redistributable), so we remove them.
+rm include/GL/uglglutshapes.h
+
+#-- Build ------------------------------------------------------------
+%build
+# Macroize this to simplify things
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
+export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}
+export DRI_DRIVER_DIR="%{_libdir}/dri"
+
+make OPT_FLAGS="$RPM_OPT_FLAGS" linux
+
+#-- Install ----------------------------------------------------------
+%install
+rm -rf $RPM_BUILD_ROOT
+# total hack job, since make install won't do what we want at all
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
+export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir}/GL
+{
+    mkdir -p ${LIB_DIR}
+    mkdir -p ${INCLUDE_DIR}
+    install -m0755 %{_lib}/libGLw.so.1.0.0 ${LIB_DIR}
+    ( cd ${LIB_DIR} && ln -s libGLw.so.1.0.0 libGLw.so.1 && ln -s libGLw.so.1 libGLw.so )
+    install -m0644 src/glw/GLwDrawA.h ${INCLUDE_DIR}
+    install -m0644 src/glw/GLwMDrawA.h ${INCLUDE_DIR}
+    install -m0644 src/glw/GLwMDrawAP.h ${INCLUDE_DIR}
+    install -m0644 src/glw/GLwDrawAP.h ${INCLUDE_DIR}
+}
+
+#-- Clean ------------------------------------------------------------
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+#-- Check ------------------------------------------------------------
+%check
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc src/glw/README
+%{_libdir}/libGLw.so.1
+%{_libdir}/libGLw.so.1.0.0
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libGLw.so
+%{_includedir}/GL/GLwDrawA.h
+%{_includedir}/GL/GLwDrawAP.h
+%{_includedir}/GL/GLwMDrawA.h
+%{_includedir}/GL/GLwMDrawAP.h
+
+%changelog
+* Tue Sep 19 2006 Adam Jackson <ajackson@redhat.com> 6.5.1-0.2
+- Use 6.5.1 release tarball.  Drop patches and build scripts that are no
+  longer necessary.
+
+* Tue Sep 19 2006 Adam Jackson <ajackson@redhat.com> 6.5.1-0.1
+- Move revision back up to 6.5.1 for upgrade path from FC5.  Misc other
+  spec fixes as per bug #188974 comment 30.
+
+* Mon Sep 18 2006 Adam Jackson <ajackson@redhat.com> 1.0-4
+- Rename back to mesa-libGLw as per bug #188974.
+
+* Wed Aug 30 2006 Tom "spot" Callaway <tcallawa@redhat.com> 1.0-3
+- Fix package for x86_64
+
+* Tue Aug 29 2006 Tom "spot" Callaway <tcallawa@redhat.com> 1.0-2
+- Fix package to depend on lesstif-devel
+- -devel now Requires libGL-devel
+- use name var in -devel Requires
+- actually use RPM_OPT_FLAGS
+- symlink devel libs, not copy (except for .*.*.*)
+
+* Fri Aug  7 2006 Adam Jackson <ajackson@redhat.com> 1.0-1
+- Split libGLw out from Mesa.
--- a/1
+++ b/1
@ -0,0 +1 @@
+c46f2c6646a270911b791dd8e1c2d977  MesaLib-6.5.1.tar.bz2
				`@ -0,0 +1 @@`
				`c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2`