6996309 Introduce libXcb in Solaris [fix packaging]
authorStefan Teleman <stefan.teleman@oracle.com>
Fri, 29 Oct 2010 17:20:47 -0700
changeset 1031 2e0fa97e6af8
parent 1030 0738233d0472
child 1032 050d10bf357f
6996309 Introduce libXcb in Solaris [fix packaging]
exception_lists/packaging
open-src/lib/freeglut/Makefile
open-src/lib/freeglut/Makefile.in.0.patch
pkg/manifests/x11-library-libxcb.mf
--- a/exception_lists/packaging	Fri Oct 29 11:17:36 2010 -0700
+++ b/exception_lists/packaging	Fri Oct 29 17:20:47 2010 -0700
@@ -94,3 +94,8 @@
 usr/lib/xorg/sparcv9/libdrm_intel.so.1		sparc
 usr/lib/pkgconfig/libdrm_intel.pc		sparc
 usr/lib/sparcv9/pkgconfig/libdrm_intel.pc	sparc
+
+# We don't install the XCB SELinux extension
+usr/include/xcb/xselinux.h
+usr/share/xcb/xselinux.xml
+
--- a/open-src/lib/freeglut/Makefile	Fri Oct 29 11:17:36 2010 -0700
+++ b/open-src/lib/freeglut/Makefile	Fri Oct 29 17:20:47 2010 -0700
@@ -133,3 +133,15 @@
 # But we don't want autoreconf
 AUTORECONF=no
 
+install: install_extra_symlinks
+
+install_extra_symlinks:
+	( cd $(PROTODIR)/usr/lib/GL ; \
+	    ln -sf ../libglut.so.3.9.0 libglut.so.3 ; \
+	    ln -sf ../libglut.so.3.9.0 libglut.so ; \
+	    cd - )
+	( cd $(PROTODIR)/usr/lib/GL/$(SUBDIR64) ; \
+	    ln -sf ../../$(SUBDIR64)/libglut.so.3.9.0 libglut.so.3 ; \
+	    ln -sf ../../$(SUBDIR64)/libglut.so.3.9.0 libglut.so ; \
+	    cd - )
+
--- a/open-src/lib/freeglut/Makefile.in.0.patch	Fri Oct 29 11:17:36 2010 -0700
+++ b/open-src/lib/freeglut/Makefile.in.0.patch	Fri Oct 29 17:20:47 2010 -0700
@@ -1,5 +1,14 @@
 --- doc/Makefile.in	2009-11-25 11:14:29.000000000 -0800
-+++ doc/Makefile.in	2010-10-22 11:06:14.746946682 -0700
++++ doc/Makefile.in	2010-10-29 16:52:04.575893925 -0700
+@@ -42,7 +42,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++DISTFILES = $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ AR = @AR@
 @@ -135,7 +135,7 @@
  builddir = @builddir@
  datadir = @datadir@
@@ -9,7 +18,7 @@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
-@@ -216,31 +216,16 @@
+@@ -216,31 +216,18 @@
  
  
  distdir: $(DISTFILES)
@@ -41,14 +50,16 @@
 -	    || cp -p $$d/$$file $(distdir)/$$file \
 -	    || exit 1; \
 -	  fi; \
-+	    cp -pR $$file $(DESTDIR)/$(docdir)/$$file || exit 1; \
++	    cp -fpR $$file $(DESTDIR)/$(docdir)/$$file || exit 1; \
 +	    chmod 0644 $(DESTDIR)/$(docdir)/$$file || exit 1; \
++	    rm -f $(DESTDIR)/$(docdir)/Makefile.am; \
++	    rm -f $(DESTDIR)/$(docdir)/Makefile.in; \
  	done
 +
  check-am: all-am
  check: check-am
  all-am: Makefile
-@@ -250,7 +235,7 @@
+@@ -250,7 +237,7 @@
  install-data: install-data-am
  uninstall: uninstall-am
  
--- a/pkg/manifests/x11-library-libxcb.mf	Fri Oct 29 11:17:36 2010 -0700
+++ b/pkg/manifests/x11-library-libxcb.mf	Fri Oct 29 17:20:47 2010 -0700
@@ -77,7 +77,6 @@
 #
 link path=usr/lib/libxcb-composite.so target=./libxcb-composite.so.0
 link path=usr/lib/libxcb-damage.so target=./libxcb-damage.so.0
-link path=usr/lib/libxcb-dpms.so target=./libxcb-damage.so.0
 link path=usr/lib/libxcb-dpms.so target=./libxcb-dpms.so.0
 link path=usr/lib/libxcb-dri2.so target=./libxcb-dri2.so.0
 link path=usr/lib/libxcb-glx.so target=./libxcb-glx.so.0
@@ -126,7 +125,6 @@
 #
 link path=usr/lib/$(ARCH64)/libxcb-composite.so target=./libxcb-composite.so.0
 link path=usr/lib/$(ARCH64)/libxcb-damage.so target=./libxcb-damage.so.0
-link path=usr/lib/$(ARCH64)/libxcb-dpms.so target=./libxcb-damage.so.0
 link path=usr/lib/$(ARCH64)/libxcb-dpms.so target=./libxcb-dpms.so.0
 link path=usr/lib/$(ARCH64)/libxcb-dri2.so target=./libxcb-dri2.so.0
 link path=usr/lib/$(ARCH64)/libxcb-glx.so target=./libxcb-glx.so.0