debian/libgl1-mesa-dri.install.in | 2 - debian/not-installed | 34 ------------------------------- debian/patches/118-dricore-gallium.patch | 21 ++++++++++--------- debian/rules | 11 ---------- 4 files changed, 13 insertions(+), 55 deletions(-)
New commits: commit 716e08fb054e186aff13f97bb71125af7ef2e9d6 Author: Maarten Lankhorst <[email protected]> Date: Fri Feb 8 14:26:12 2013 +0100 cleanup rules diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in index d6b0dfa..89ff2a2 100644 --- a/debian/libgl1-mesa-dri.install.in +++ b/debian/libgl1-mesa-dri.install.in @@ -2,4 +2,4 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* usr/lib/${DEB_HOST_MULTIARCH}/ dri/usr/lib/${DEB_HOST_MULTIARCH}/libllvmradeon*.so usr/lib/${DEB_HOST_MULTIARCH}/ -dri/usr/lib/${DEB_HOST_MULTIARCH}/libgallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/ \ No newline at end of file +dri/usr/lib/${DEB_HOST_MULTIARCH}/lib*gallium*.so* usr/lib/${DEB_HOST_MULTIARCH}/ \ No newline at end of file diff --git a/debian/not-installed b/debian/not-installed index 67dd2b5..e071eb7 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -7,36 +7,4 @@ NOT_INSTALLED := \ dri/usr/include/GL/wmesa.h \ dri/usr/include/GLES3/gl3platform.h \ dri/usr/include/GLES3/gl3ext.h \ - dri/usr/include/GLES3/gl3.h \ - dri/usr/lib/*/libGL.so \ - dri/usr/lib/*/pkgconfig/gl.pc \ - usr/include/GL/glext.h \ - usr/include/GL/gl.h \ - usr/include/GL/gl_mangle.h \ - usr/include/GL/glxext.h \ - usr/include/GL/glx.h \ - usr/include/GL/glx_mangle.h \ - usr/include/GL/osmesa.h \ - usr/include/GL/wglext.h \ - usr/include/GL/wmesa.h - -# Architecture-specific additional files: -NOT_INSTALLED_i386 = \ - usr/lib/*/i686/cmov/libGL.so \ - usr/lib/*/i686/cmov/pkgconfig/gl.pc - -# Same for linux, kfreebsd, and hurd on i386: -NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386) -NOT_INSTALLED_hurd-i386 = $(NOT_INSTALLED_i386) - -# Detect the current architecture and add the files if any: -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -NOT_INSTALLED += $(NOT_INSTALLED_$(DEB_HOST_ARCH)) - -# Additional files which may or may not be there (depending on -# whether it's from a tarball or from a git snapshot): -NOT_INSTALLED_EITHER = \ - dri/usr/include/GL/glutf90.h \ - dri/usr/include/GL/glut.h \ - usr/include/GL/glutf90.h \ - usr/include/GL/glut.h + dri/usr/include/GLES3/gl3.h diff --git a/debian/rules b/debian/rules index 975fb18..3f1f626 100755 --- a/debian/rules +++ b/debian/rules @@ -141,11 +141,6 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp build: build-stamp build-stamp: $(BUILD_STAMPS) - # Build pot file for pkgstriptranslations - # We do this only once, and outside the build trees, so that - # pkgstriptranslations doesn't get confused. - $(MAKE) -C src/mesa/drivers/dri/common/xmlpool pot - >$@ $(STAMP)-build-%: configure @@ -205,10 +200,6 @@ clean: unpatch rm -f src/mapi/glapi/gen/*.pyc rm -f src/mesa/main/*.pyc rm -f src/gallium/auxiliary/util/*.pyc - - # And for pkgstriptranslation's benefit… - rm -f src/mesa/drivers/dri/common/xmlpool/xmlpool.pot - dh_clean # Build architecture-independent files here. @@ -232,8 +223,6 @@ binary-arch: install # Also get rid of other files which aren't installed. Do not # use -f to ensure we notice disappearing files: set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done - # Files only in git, not in tarballs, OK to use rm -f here: - set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f debian/tmp/$$file; done # No need for these .so, they're just convenience libraries: rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so commit 5cec768d5554a457fee7f1516172f531c887b258 Author: Maarten Lankhorst <[email protected]> Date: Fri Feb 8 13:58:36 2013 +0100 finally make dricore-gallium patch work diff --git a/debian/patches/118-dricore-gallium.patch b/debian/patches/118-dricore-gallium.patch index f995aea..4ec18d8 100644 --- a/debian/patches/118-dricore-gallium.patch +++ b/debian/patches/118-dricore-gallium.patch @@ -33,11 +33,12 @@ $(top_builddir)/$(LIB_DIR)/libdricore@[email protected] --- a/configure.ac +++ b/configure.ac -@@ -928,6 +928,7 @@ +@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_PC_LIB_PRIV]) DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" -+MESAGALLIUM_LIBS="\$(top_builddir)/src/mesa/libdricore/libmesagallium${VERSION}.la $(DRI_LIB_DEPS)" ++MESAGALLIUM_LIBS="\$(top_builddir)/src/mesa/libdricore/libmesagallium${VERSION}.la ${DRI_LIB_DEPS}" ++AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS}) AC_SUBST([HAVE_XF86VIDMODE]) @@ -48,7 +49,7 @@ i915_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ @@ -59,7 +60,7 @@ nouveau_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ @@ -70,7 +71,7 @@ r300_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ @@ -81,7 +82,7 @@ r600_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/r600/libr600.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ @@ -92,7 +93,7 @@ radeonsi_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ @@ -103,7 +104,7 @@ swrast_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ @@ -114,7 +115,7 @@ vmwgfx_dri_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesagallium.la \ -+ $(MESAGALLIUM_LIBS) \ ++ @MESAGALLIUM_LIBS@ \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ @@ -125,7 +126,7 @@ egl_gallium_la_LIBADD += \ - $(top_builddir)/src/mesa/libmesagallium.la -+ $(MESAGALLIUM_LIBS) ++ @MESAGALLIUM_LIBS@ # make st/mesa built-in when there is a single glapi provider if HAVE_SHARED_GLAPI egl_gallium_la_LIBADD += \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
