summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/ptlib/distinfo3
-rw-r--r--devel/ptlib/patches/patch-include_ptlib_critsec.h13
-rw-r--r--multimedia/libvpx/distinfo4
-rw-r--r--multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h15
-rw-r--r--multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c15
-rw-r--r--x11/qt4-libs/distinfo4
-rw-r--r--x11/qt4-libs/patches/patch-aq25
7 files changed, 67 insertions, 12 deletions
diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo
index bd3d580ea8f..37785107646 100644
--- a/devel/ptlib/distinfo
+++ b/devel/ptlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/10/14 14:36:12 joerg Exp $
+$NetBSD: distinfo,v 1.19 2015/06/29 21:13:30 markd Exp $
SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = d05e68485a9cd3190410e7f4beb14ac44050d2cb
SHA1 (patch-configure.ac) = f319f4a183a6fc6c59693f516d9c68921625158b
SHA1 (patch-include_ptbuildopts.h.in) = 2b7ba6a6dbbe9480880652de774afbff346ce635
SHA1 (patch-include_ptclib_pldap.h) = ccb5b36a5afa7d1762e90eb9bfdb134066d2d84f
+SHA1 (patch-include_ptlib_critsec.h) = 519cee6e56d1e5a33b88237536ff4d921d7d5c44
SHA1 (patch-include_ptlib_object.h) = 9ce0a2f333ab06ca17506481c2ae8b5b47441f85
SHA1 (patch-include_ptlib_pmachdep.h) = 92dd7b693dc8d10ffaee7a22f8a3f3a1526e55c2
SHA1 (patch-make_unix.mak) = 13d814a914b3bc4897a350f4393873b9b3a2b685
diff --git a/devel/ptlib/patches/patch-include_ptlib_critsec.h b/devel/ptlib/patches/patch-include_ptlib_critsec.h
new file mode 100644
index 00000000000..a055e133f7b
--- /dev/null
+++ b/devel/ptlib/patches/patch-include_ptlib_critsec.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_ptlib_critsec.h,v 1.1 2015/06/29 21:13:30 markd Exp $
+
+--- include/ptlib/critsec.h.orig 2012-08-23 02:13:00.000000000 +0000
++++ include/ptlib/critsec.h
+@@ -40,7 +40,7 @@
+ #if P_HAS_ATOMIC_INT
+
+ #if defined(__GNUC__)
+-# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
++# if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2) || __GNUC__ >= 5
+ # include <ext/atomicity.h>
+ # else
+ # include <bits/atomicity.h>
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 0b8d65bb209..cb8d67cf6ef 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2014/11/14 11:51:01 jmcneill Exp $
+$NetBSD: distinfo,v 1.27 2015/06/29 21:09:11 markd Exp $
SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9
RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835
@@ -10,6 +10,8 @@ SHA1 (patch-ad) = e63453d0d13ddbcbf243ece9818bbc9e1bd174b5
SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
+SHA1 (patch-nestegg_halloc_src_align.h) = 8ad126c493be4c075c7c1a2d93f2a11f3ce4fd53
+SHA1 (patch-nestegg_halloc_src_halloc.c) = 0d2f7438d718b6ceb83fe11c05c86103e507128c
SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
SHA1 (patch-test_sad__test.cc) = fb39c0ca4ce5f424d878779a2d58ebe77c41e8b3
SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h b/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h
new file mode 100644
index 00000000000..e60db0ed4d0
--- /dev/null
+++ b/multimedia/libvpx/patches/patch-nestegg_halloc_src_align.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-nestegg_halloc_src_align.h,v 1.1 2015/06/29 21:09:11 markd Exp $
+
+rename to avoid conflict with gcc5.x stddef.h
+
+--- nestegg/halloc/src/align.h.orig 2013-11-18 22:18:52.000000000 +0000
++++ nestegg/halloc/src/align.h
+@@ -30,7 +30,7 @@ union max_align
+ void (*q)(void);
+ };
+
+-typedef union max_align max_align_t;
++typedef union max_align h_max_align_t;
+
+ #endif
+
diff --git a/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c b/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c
new file mode 100644
index 00000000000..4c3a0e4c352
--- /dev/null
+++ b/multimedia/libvpx/patches/patch-nestegg_halloc_src_halloc.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-nestegg_halloc_src_halloc.c,v 1.1 2015/06/29 21:09:11 markd Exp $
+
+rename to avoid conflict with gcc5.x stddef.h
+
+--- nestegg/halloc/src/halloc.c.orig 2013-11-18 22:18:52.000000000 +0000
++++ nestegg/halloc/src/halloc.c
+@@ -30,7 +30,7 @@ typedef struct hblock
+ #endif
+ hlist_item_t siblings; /* 2 pointers */
+ hlist_head_t children; /* 1 pointer */
+- max_align_t data[1]; /* not allocated, see below */
++ h_max_align_t data[1]; /* not allocated, see below */
+
+ } hblock_t;
+
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 5bdd550493d..2999fb7e744 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2015/06/25 08:02:25 joerg Exp $
+$NetBSD: distinfo,v 1.100 2015/06/29 21:06:14 markd Exp $
SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6
RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33
@@ -20,7 +20,7 @@ SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = d2818f69e89a2d0531df57daabd255ddeef0acb9
+SHA1 (patch-aq) = 44dcc5b8445776ddd5dd9ee4580ab6ed4e51bd74
SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index fecd310c6d8..20cff98046b 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
+$NetBSD: patch-aq,v 1.15 2015/06/29 21:06:14 markd Exp $
---- configure.orig 2013-06-07 05:16:41.000000000 +0000
+--- configure.orig 2014-04-10 18:37:08.000000000 +0000
+++ configure
@@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
CFG_HOST_ARCH=x86_64
@@ -18,7 +18,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit PowerPC (powerpc)"
fi
-@@ -3253,6 +3253,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3259,6 +3259,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=sparc
;;
@@ -38,7 +38,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
QNX:*:*)
case "$UNAME_MACHINE" in
x86pc)
-@@ -3561,7 +3574,7 @@ fi
+@@ -3567,7 +3580,7 @@ fi
if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
# get the darwin version. 10.0.0 and up means snow leopard.
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -47,7 +47,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
echo
echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
echo
-@@ -5058,7 +5071,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+@@ -5074,7 +5087,7 @@ if true; then ###[ '!' -f "$outpath/bin/
done
QMAKE_BUILD_ERROR=no
@@ -56,7 +56,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
[ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
-@@ -7158,7 +7171,7 @@ fi
+@@ -7198,7 +7211,7 @@ fi
# select Carbon on 10.4 Tiger.
if [ "$PLATFORM_MAC" = "yes" ]; then
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -65,7 +65,16 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
CFG_MAC_COCOA="no";
CFG_MAC_CARBON="yes";
fi
-@@ -8422,7 +8435,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+@@ -7729,7 +7742,7 @@ case "$XPLATFORM" in
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 4*|3.4*)
++ 5*|4*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
+@@ -8475,7 +8488,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
@@ -74,7 +83,7 @@ $NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "yes" ]; then
[ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
-@@ -8638,6 +8651,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
+@@ -8691,6 +8704,7 @@ cat >>"$QTCONFIG.tmp" <<EOF
#configuration
CONFIG += $QTCONFIG_CONFIG
QT_ARCH = $CFG_ARCH
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 01:29:46 +0000