- updated soname patch to use sonames compatibla with later versions of glide2x

  (libglide.so.2, libtexus.so.1); keep libglide2x.so, libtexus.so symlinks

Changed files:
    Glide_VG-soname.patch -> 1.2
    Glide_VG.spec -> 1.34

diff --git a/Glide_VG-soname.patch b/Glide_VG-soname.patch
index 433bd2e9de52677bc72894f550639d6977f504d9..31f053f5e12f47638acf043ee4ff8a03d0421d56 100644 (file)
--- a/Glide_VG-soname.patch
+++ b/Glide_VG-soname.patch
@@ -1,10 +1,72 @@
 --- Glide_VG-2.46/swlibs/include/make/3dfx.mak.orig    1999-11-29 20:48:02.000000000 +0100
-+++ Glide_VG-2.46/swlibs/include/make/3dfx.mak 2004-04-24 17:27:44.802468880 +0200
-@@ -194,6 +194,7 @@
++++ Glide_VG-2.46/swlibs/include/make/3dfx.mak 2012-01-13 16:34:50.994605338 +0100
+@@ -192,8 +192,15 @@
+ $(LIBRARIES): $(LIBPARTS)
+       $(AR) $*.a $(LIBPARTS)
  
++# We need to glean the soname from the name of the library, this
++# is pretty good as long as shared library names are reasonable.
++ifneq "$(SHARED_LIBRARY)" ""
++SONAME := $(shell echo $(SHARED_LIBRARY) | cut -d "." -f 1-3)
++BASENAME := $(shell echo $(SHARED_LIBRARY) | cut -d "." -f 1-2)
++endif
++
  $(SHARED_LIBRARY): $(LIBPARTS) $(SUBLIBRARIES)
-       $(LINK) $(LDFLAGS) -shared -o $(SHARED_LIBRARY) \
-+              -Xlinker -soname=$(SHARED_LIBRARY) \
+-      $(LINK) $(LDFLAGS) -shared -o $(SHARED_LIBRARY) \
++      $(LINK) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_LIBRARY) \
                -Xlinker --whole-archive \
                $(LIBRARIES) $(SUBLIBRARIES) \
                -Xlinker --no-whole-archive \
+@@ -205,6 +212,8 @@
+       $(INSTALL) -m 444 $(LIBRARIES) $(INSTALL_DESTINATION)/lib
+ ifneq "$(SHARED_LIBRARY)" ""
+       $(INSTALL) -m 444 $(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib
++      ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(SONAME)
++      ln -sf $(INSTALL_DESTINATION)/lib/$(SHARED_LIBRARY) $(INSTALL_DESTINATION)/lib/$(BASENAME)
+ endif
+ else
+       @echo INSTALL_DESTINATION not defined, not installing LIBRARIES
+--- Glide_VG-2.46/sst1/glide/src/makefile.unix.orig    1999-11-29 20:48:01.000000000 +0100
++++ Glide_VG-2.46/sst1/glide/src/makefile.unix 2012-01-13 16:03:17.497875271 +0100
+@@ -167,7 +167,7 @@
+ LDIRT     = fxgasm.o fxgasm fxgasm.h
+ 
+ LIBRARIES         = libglide2x.a
+-SHARED_LIBRARY      = libglide2x.so
++SHARED_LIBRARY      = libglide.so.2.46
+ 
+ include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak
+ 
+--- Glide_VG-2.46/swlibs/texus/lib/makefile.unix.orig  1999-11-29 20:48:02.000000000 +0100
++++ Glide_VG-2.46/swlibs/texus/lib/makefile.unix       2012-01-13 16:01:55.061205846 +0100
+@@ -41,7 +41,7 @@
+ INSTALL_DESTINATION = $(BUILD_ROOT_SWLIBS)
+ 
+ LIBRARIES = libtexus.a
+-SHARED_LIBRARY = libtexus.so
++SHARED_LIBRARY = libtexus.so.1.1
+ SUBLIBRARIES = $(BUILD_ROOT_SWLIBS)/lib/libfxmisc.a
+ 
+ include $(BUILD_ROOT_SWLIBS)/include/make/3dfx.mak
+--- Glide_VG-2.46/swlibs/texus/examples/makefile.unix.orig     1999-11-29 20:48:02.000000000 +0100
++++ Glide_VG-2.46/swlibs/texus/examples/makefile.unix  2012-01-13 16:39:48.564615304 +0100
+@@ -23,7 +23,7 @@
+ LCINCS  = -I$(BUILD_ROOT_SST1)/include \
+           -I$(BUILD_ROOT_SWLIBS)/include
+ 
+-LLDLIBS = -lglide2x -ltexus
++LLDLIBS = -lglide -ltexus
+ 
+ INSTALL_DESTINATION = $(BUILD_ROOT_SWLIBS)
+ CFILES  =       viewppm.c view3df.c
+--- Glide_VG-2.46/sst1/glide/tests/makefile.unix.orig  1999-11-29 20:48:23.000000000 +0100
++++ Glide_VG-2.46/sst1/glide/tests/makefile.unix       2012-01-13 16:39:21.777947740 +0100
+@@ -20,7 +20,7 @@
+ 
+ LIBOBJS = tlib.o plib.o
+ 
+-LLDLIBS = $(LIBOBJS) -lglide2x
++LLDLIBS = $(LIBOBJS) -lglide
+ 
+ PRIVATE_HEADERS = tlib.h tlib.c plib.h plib.c tldata.inc
+ 

diff --git a/Glide_VG.spec b/Glide_VG.spec
index b63c84f217237286cd2d3a608cce3414cd52c6f4..f7c23e187991f6ac2e184f5c6b334be166f6ab33 100644 (file)
--- a/Glide_VG.spec
+++ b/Glide_VG.spec
@@ -71,9 +71,12 @@ install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/glide} \
        $RPM_BUILD_ROOT%{_examplesdir}/glide/{tests,texus/{lib,cmd,examples}}
 
 # Install the glibc 2.1 libraries normally
-install sst1/lib/libglide2x.so $RPM_BUILD_ROOT%{_libdir}/libglide2x_VG.so
-install swlibs/lib/libtexus.so $RPM_BUILD_ROOT%{_libdir}
-ln -sf libglide2x_VG.so $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
+install sst1/lib/libglide.so.2.46 $RPM_BUILD_ROOT%{_libdir}
+ln -sf libglide.so.2.46 $RPM_BUILD_ROOT%{_libdir}/libglide.so.2
+ln -sf libglide.so.2 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
+install swlibs/lib/libtexus.so.1.1 $RPM_BUILD_ROOT%{_libdir}
+ln -sf libtexus.so.1.1 $RPM_BUILD_ROOT%{_libdir}/libtexus.so.1
+ln -sf libtexus.so.1 $RPM_BUILD_ROOT%{_libdir}/libtexus.so
 
 # Install the executables
 install swlibs/bin/texus $RPM_BUILD_ROOT%{_bindir}
@@ -118,8 +121,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc glide_license.txt readme.txt
 %attr(755,root,root) %{_bindir}/texus
 %attr(755,root,root) %{_bindir}/test3Dfx
+%attr(755,root,root) %{_libdir}/libglide.so.2.46
+%attr(755,root,root) %ghost %{_libdir}/libglide.so.2
 %attr(755,root,root) %{_libdir}/libglide2x.so
-%attr(755,root,root) %{_libdir}/libglide2x_VG.so
+%attr(755,root,root) %{_libdir}/libtexus.so.1.1
+%attr(755,root,root) %ghost %{_libdir}/libtexus.so.1
 %attr(755,root,root) %{_libdir}/libtexus.so
 
 %files -n Glide2x_SDK