Date: Tue, 13 May 2014 10:34:48 +0200 From: Tijl Coosemans <tijl@FreeBSD.org> To: x11@FreeBSD.org Subject: [patch] graphics/libGL/bsd.mesalib.mk: USES=libtool + misc Message-ID: <20140513103448.6a99ce1b@kalimero.tijl.coosemans.org>
next in thread | raw e-mail | index | archive | help
--MP_/eQsX5Ztx8FbgHiNqFRkSrWg
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi,
The attached patch contains the following changes for bsd.mesalib.mk:
- USES=tar:bzip2.
- Under WITH_NEW_XORG:
+ Replace USE_AUTOTOOLS, REAPPLY_PATCHES and pre-configure with a
patch for Makefile.in. The patch removes some make dependencies
for aclocal.m4 which are absent.
+ Add INSTALL_TARGET=install-strip to strip libraries.
+ Add USES=libtool:keepla and remove several patches.
+ In post-patch replace /use with /usr.
- Bump PORTREVISION and adjust pkg-plist for graphics/dri, graphics/libEGL,
graphics/libGL and graphics/libglesv2.
Redports results for 11-CURRENT:
https://redports.org/buildarchive/20140512151910-98479/
https://redports.org/buildarchive/20140512185846-56623/
https://redports.org/buildarchive/20140512185919-89700/
https://redports.org/buildarchive/20140512185946-06383/
Ok to commit?
--MP_/eQsX5Ztx8FbgHiNqFRkSrWg
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=mesa.patch
Index: graphics/dri/Makefile
===================================================================
--- graphics/dri/Makefile (revision 353921)
+++ graphics/dri/Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= graphics
Index: graphics/dri/pkg-plist
===================================================================
--- graphics/dri/pkg-plist (revision 353921)
+++ graphics/dri/pkg-plist (working copy)
@@ -31,6 +31,7 @@ include/GL/internal/dri_interface.h
%%NEW%%lib/libdricore%%VERSION%%.la
%%NEW%%lib/libdricore%%VERSION%%.so
%%NEW%%lib/libdricore%%VERSION%%.so.1
+%%NEW%%lib/libdricore%%VERSION%%.so.1.0.0
%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la
%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
libdata/pkgconfig/dri.pc
Index: graphics/libEGL/Makefile
===================================================================
--- graphics/libEGL/Makefile (revision 353921)
+++ graphics/libEGL/Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= libEGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenEGL library
Index: graphics/libEGL/pkg-plist
===================================================================
--- graphics/libEGL/pkg-plist (revision 353921)
+++ graphics/libEGL/pkg-plist (working copy)
@@ -6,6 +6,7 @@ include/KHR/khrplatform.h
lib/libEGL.la
lib/libEGL.so
lib/libEGL.so.1
+lib/libEGL.so.1.0.0
libdata/pkgconfig/egl.pc
@dirrmtry include/KHR
@dirrmtry include/EGL
Index: graphics/libGL/Makefile
===================================================================
--- graphics/libGL/Makefile (revision 353921)
+++ graphics/libGL/Makefile (working copy)
@@ -19,7 +19,7 @@ SUB_FILES= pkg-install pkg-deinstall
.include <bsd.port.options.mk>
.if defined(WITH_NEW_XORG)
-LIBGLREVISION= 0
+LIBGLREVISION= 1
.else
LIBGLREVISION= 4
.endif
Index: graphics/libGL/bsd.mesalib.mk
===================================================================
--- graphics/libGL/bsd.mesalib.mk (revision 353921)
+++ graphics/libGL/bsd.mesalib.mk (working copy)
@@ -33,9 +33,8 @@ BUILD_DEPENDS+= makedepend:${PORTSDIR}/d
python2:${PORTSDIR}/lang/python2 \
${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-USES+= bison gmake pathfix pkgconfig shebangfix
+USES+= bison gmake pathfix pkgconfig shebangfix tar:bzip2
USE_PYTHON_BUILD=-2.7
-USE_BZIP2= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -48,19 +47,10 @@ CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBAS
.endif
.if defined(WITH_NEW_XORG)
-USE_AUTOTOOLS= autoconf:env automake:env libtool:env
+INSTALL_TARGET= install-strip
+USES+= libtool:keepla
# probably be shared lib, and in it own port.
CONFIGURE_ARGS+= --enable-shared-glapi=no
-# we need to reapply these patches because we doing wierd stuff with autogen
-REAPPLY_PATCHES= \
- ${PATCHDIR}/patch-configure \
- ${PATCHDIR}/patch-src_egl_main_Makefile.in \
- ${PATCHDIR}/patch-src_glx_Makefile.in \
- ${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \
- ${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \
- ${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \
- ${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \
- ${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in
python_OLD_CMD= "/usr/bin/env[[:space:]]python"
python_CMD= ${LOCALBASE}/bin/python2
@@ -126,27 +116,11 @@ post-patch:
${WRKSRC}/src/mesa/Makefile \
${WRKSRC}/src/mesa/drivers/dri/Makefile
.else
- @${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \
+ @${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${LOCALBASE}/bin/python2|g' \
${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
${WRKSRC}/src/glsl/builtins/tools/*.py
- @${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \
+ @${REINPLACE_CMD} -e 's|!/usr/bin/python2|!${LOCALBASE}/bin/python2|g' \
${WRKSRC}/src/mesa/main/get_hash_generator.py \
${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
- ${WRKSRC}/src/mapi/glapi/gen/gl_table.py \
-
-.endif
-
-pre-configure:
-# workaround for stupid rerunning configure in do-build step
-# xxx
-.if defined(WITH_NEW_XORG)
- cd ${WRKSRC} && env NOCONFIGURE=1 sh autogen.sh
-. for file in ${REAPPLY_PATCHES}
- @cd ${WRKSRC} && ${PATCH} -p0 --quiet < ${file}
-. endfor
-# make sure the pkg-config files are installed in the correct place.
-# this was reverted by running autogen.sh
- @${FIND} ${WRKSRC} -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
- 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ;
+ ${WRKSRC}/src/mapi/glapi/gen/gl_table.py
.endif
-
Index: graphics/libGL/files/patch-Makefile.in
===================================================================
--- graphics/libGL/files/patch-Makefile.in (revision 0)
+++ graphics/libGL/files/patch-Makefile.in (working copy)
@@ -0,0 +1,13 @@
+--- Makefile.in.orig 2014-05-11 21:01:42.000000000 +0200
++++ Makefile.in 2014-05-11 21:02:12.000000000 +0200
+@@ -87,9 +87,7 @@
+ $(top_srcdir)/m4/ax_prog_flex.m4 \
+ $(top_srcdir)/m4/ax_pthread.m4 \
+ $(top_srcdir)/m4/ax_python_module.m4 \
+- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
++ $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
Property changes on: graphics/libGL/files/patch-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: graphics/libGL/files/patch-src_egl_main_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_egl_main_Makefile.in (revision 353921)
+++ graphics/libGL/files/patch-src_egl_main_Makefile.in (working copy)
@@ -1,19 +0,0 @@
---- src/egl/main/Makefile.in.orig 2013-08-01 23:22:16.000000000 +0200
-+++ src/egl/main/Makefile.in 2013-09-01 11:33:47.000000000 +0200
-@@ -990,8 +990,14 @@
- # a while by putting a link to the driver into /lib of the build tree.
- all-local: libEGL.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1
-- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so
-+ base=$(basename $<); \
-+ dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2); \
-+ ver=$$(grep current= .libs/$< | cut -d "=" -f 2); \
-+ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+ fi; \
-+ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: graphics/libGL/files/patch-src_glx_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_glx_Makefile.in (revision 353921)
+++ graphics/libGL/files/patch-src_glx_Makefile.in (working copy)
@@ -40,20 +40,3 @@
}
uninstall-libLTLIBRARIES:
-@@ -1068,8 +1068,14 @@
- # a while by putting a link to the driver into /lib of the build tree.
- all-local: lib@GL_LIB@.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-- ln -f .libs/lib@GL_LIB@.so.1.2.0 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1
-- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
-+ base=$(basename $<); \
-+ dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2); \
-+ ver=$$(grep current= .libs/$< | cut -d "=" -f 2); \
-+ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+ fi; \
-+ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: graphics/libGL/files/patch-src_mapi_es2api_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (revision 353921)
+++ graphics/libGL/files/patch-src_mapi_es2api_Makefile.in (working copy)
@@ -1,20 +0,0 @@
---- src/mapi/es2api/Makefile.in.orig 2013-08-01 23:22:21.000000000 +0200
-+++ src/mapi/es2api/Makefile.in 2013-09-01 11:38:01.000000000 +0200
-@@ -958,9 +958,14 @@
- # a while by putting a link to the driver into /lib of the build tree.
- all-local: libGLESv2.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so
-- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2
-- ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2.0.0
-+ base=$(basename $<); \
-+ dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2); \
-+ ver=$$(grep current= .libs/$< | cut -d "=" -f 2); \
-+ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+ fi; \
-+ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (revision 353921)
+++ graphics/libGL/files/patch-src_mapi_shared-glapi_Makefile.in (working copy)
@@ -1,20 +0,0 @@
---- src/mapi/shared-glapi/Makefile.in.orig 2013-06-27 00:42:45.000000000 +0200
-+++ src/mapi/shared-glapi/Makefile.in 2013-06-27 00:43:25.000000000 +0200
-@@ -889,9 +889,14 @@
-
- all-local: libglapi.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
-- ln -f .libs/libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0.0.0
-- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0
-- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so
-+ base=$(basename $<); \
-+ dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2); \
-+ ver=$$(grep current= .libs/$< | cut -d "=" -f 2); \
-+ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+ fi; \
-+ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (revision 353921)
+++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in (working copy)
@@ -1,19 +0,0 @@
---- src/mesa/libdricore/Makefile.in.orig 2013-06-27 00:21:26.000000000 +0200
-+++ src/mesa/libdricore/Makefile.in 2013-06-27 00:28:29.000000000 +0200
-@@ -3950,8 +4000,14 @@
- # a while by putting a link to the driver into /lib of the build tree.
- @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la
- @HAVE_DRI_TRUE@ $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
--@HAVE_DRI_TRUE@ ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1;
--@HAVE_DRI_TRUE@ ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
-+@HAVE_DRI_TRUE@ base=$(basename $<); \
-+@HAVE_DRI_TRUE@ dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2); \
-+@HAVE_DRI_TRUE@ ver=$$(grep current= .libs/$< | cut -d "=" -f 2); \
-+@HAVE_DRI_TRUE@ ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+@HAVE_DRI_TRUE@ if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+@HAVE_DRI_TRUE@ ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+@HAVE_DRI_TRUE@ fi; \
-+@HAVE_DRI_TRUE@ ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
-
- -include $(DEPENDS)
-
Index: graphics/libGL/pkg-plist
===================================================================
--- graphics/libGL/pkg-plist (revision 353921)
+++ graphics/libGL/pkg-plist (working copy)
@@ -17,6 +17,7 @@ include/GL/wmesa.h
%%NEW%%lib/.libGL/libGL.la
lib/.libGL/libGL.so
lib/.libGL/libGL.so.1
+%%NEW%%lib/.libGL/libGL.so.1.2.0
libdata/pkgconfig/gl.pc
@dirrm lib/.libGL
@dirrmtry include/GL
Index: graphics/libglesv2/Makefile
===================================================================
--- graphics/libglesv2/Makefile (revision 353921)
+++ graphics/libglesv2/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= libglesv2
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL ES v2 library
Index: graphics/libglesv2/pkg-plist
===================================================================
--- graphics/libglesv2/pkg-plist (revision 353921)
+++ graphics/libglesv2/pkg-plist (working copy)
@@ -7,6 +7,7 @@ include/GLES3/gl3platform.h
lib/libGLESv2.la
lib/libGLESv2.so
lib/libGLESv2.so.2
+lib/libGLESv2.so.2.0.0
libdata/pkgconfig/glesv2.pc
@dirrmtry include/GLES3
@dirrmtry include/GLES2
--MP_/eQsX5Ztx8FbgHiNqFRkSrWg--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140513103448.6a99ce1b>