diff options
| -rw-r--r-- | graphics/libtxc_dxtn/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libtxc_dxtn/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libtxc_dxtn/files/patch-Makefile.am | 13 | ||||
| -rw-r--r-- | graphics/libtxc_dxtn/files/patch-configure.ac | 18 |
4 files changed, 4 insertions, 35 deletions
diff --git a/graphics/libtxc_dxtn/Makefile b/graphics/libtxc_dxtn/Makefile index 03fb796..a4722ac 100644 --- a/graphics/libtxc_dxtn/Makefile +++ b/graphics/libtxc_dxtn/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libtxn_dxtn -PORTVERSION= 20131104 +PORTVERSION= 20140604 CATEGORIES= graphics MAINTAINER= x11@FreeBSD.org @@ -15,7 +15,7 @@ BUILD_DEPENDS= libGL>=9.1.7:${PORTSDIR}/graphics/libGL USE_GITHUB= yes GH_ACCOUNT= divVerent GH_PROJECT= s2tc -GH_COMMIT= c9a70d0 +GH_COMMIT= 3d644da GH_TAGNAME= ${GH_COMMIT} USES= libtool pathfix pkgconfig diff --git a/graphics/libtxc_dxtn/distinfo b/graphics/libtxc_dxtn/distinfo index 4ba450d..a914c56 100644 --- a/graphics/libtxc_dxtn/distinfo +++ b/graphics/libtxc_dxtn/distinfo @@ -1,2 +1,2 @@ -SHA256 (libtxn_dxtn-20131104.tar.gz) = 910a3dffa7ca1fce4dc6f5fa0f6adc8e241511ecc4d65894051e2b69b3077ebc -SIZE (libtxn_dxtn-20131104.tar.gz) = 1397339 +SHA256 (libtxn_dxtn-20140604.tar.gz) = e6fe8827c68de7ba62f5e4996cec62ee3248bc6f98707d4a36425a537c179333 +SIZE (libtxn_dxtn-20140604.tar.gz) = 1397439 diff --git a/graphics/libtxc_dxtn/files/patch-Makefile.am b/graphics/libtxc_dxtn/files/patch-Makefile.am deleted file mode 100644 index c8afaa6..0000000 --- a/graphics/libtxc_dxtn/files/patch-Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.am -+++ Makefile.am -@@ -10,8 +10,8 @@ s2tc_from_s3tc_SOURCES = s2tc_from_s3tc.cpp s2tc_license.h - s2tc_compress_SOURCES = s2tc_compress.cpp txc_dxtn.h s2tc_license.h - s2tc_decompress_SOURCES = s2tc_decompress.cpp txc_dxtn.h s2tc_license.h - if ENABLE_RUNTIME_LINKING --s2tc_compress_LDADD = -ldl --s2tc_decompress_LDADD = -ldl -+s2tc_compress_LDADD = $(LIBDL_LDADD) -+s2tc_decompress_LDADD = $(LIBDL_LDADD) - else - if ENABLE_LIB - s2tc_compress_LDADD = libtxc_dxtn.la diff --git a/graphics/libtxc_dxtn/files/patch-configure.ac b/graphics/libtxc_dxtn/files/patch-configure.ac deleted file mode 100644 index 198396c..0000000 --- a/graphics/libtxc_dxtn/files/patch-configure.ac +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -27,6 +27,15 @@ AS_IF([test x"$enable_runtime_linking" = xno], , - [AS_IF([test x"$enable_dlopen" != xno], , - [AC_MSG_ERROR([dynamic linking not possible, try --disable-runtime-linking])])]) - -+if test x"$enable_runtime_linking" = xyes; then -+ case "$host_os" in -+ linux*) -+ LIBDL_LDADD='-ldl' -+ ;; -+ esac -+fi -+AC_SUBST(LIBDL_LDADD) -+ - AC_CONFIG_FILES([Makefile txc_dxtn.pc]) - - AC_OUTPUT |