diff options
Diffstat (limited to 'graphics/libGL/files-old')
40 files changed, 1212 insertions, 206 deletions
diff --git a/graphics/libGL/files-old/patch-Makefile.in b/graphics/libGL/files-old/patch-Makefile.in new file mode 100644 index 000000000000..3adcc5d6156f --- /dev/null +++ b/graphics/libGL/files-old/patch-Makefile.in @@ -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 \ diff --git a/graphics/libGL/files-old/patch-configure b/graphics/libGL/files-old/patch-configure index c9faeefb3a67..e56b2c20a78b 100644 --- a/graphics/libGL/files-old/patch-configure +++ b/graphics/libGL/files-old/patch-configure @@ -1,52 +1,424 @@ ---- configure.orig 2013-12-12 18:52:32.304356162 +0000 -+++ configure 2013-12-12 19:50:44.434111814 +0000 -@@ -5393,7 +5393,7 @@ - ;; - *freebsd* | dragonfly*) - case "$host_cpu" in -- i*86|x86_64|powerpc*|sparc*) default_driver="dri";; -+ i*86|x86_64|ia64|powerpc*|sparc*) default_driver="dri";; - esac - ;; - esac -@@ -6946,12 +6946,35 @@ - CXXFLAGS="$CXXFLAGS -ansi -pedantic" - fi +--- configure.orig 2014-03-14 20:50:56.000000000 +0100 ++++ configure 2014-03-14 20:51:25.000000000 +0100 +@@ -779,6 +779,8 @@ + GBM_PC_REQ_PRIV + LIBUDEV_LIBS + LIBUDEV_CFLAGS ++LIBDEVQ_LIBS ++LIBDEVQ_CFLAGS + OSMESA_PC_LIB_PRIV + OSMESA_PC_REQ + OSMESA_MESA_DEPS +@@ -1126,6 +1128,8 @@ + NOUVEAU_LIBS + RADEON_CFLAGS + RADEON_LIBS ++LIBDEVQ_CFLAGS ++LIBDEVQ_LIBS + LIBUDEV_CFLAGS + LIBUDEV_LIBS + XORG_CFLAGS +@@ -1930,6 +1934,10 @@ + RADEON_CFLAGS + C compiler flags for RADEON, overriding pkg-config + RADEON_LIBS linker flags for RADEON, overriding pkg-config ++ LIBDEVQ_CFLAGS ++ C compiler flags for LIBDEVQ, overriding pkg-config ++ LIBDEVQ_LIBS ++ linker flags for LIBDEVQ, overriding pkg-config + LIBUDEV_CFLAGS + C compiler flags for LIBUDEV, overriding pkg-config + LIBUDEV_LIBS +@@ -21184,9 +21192,34 @@ + DEFINES="$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1" + DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" -- # ffb and gamma are missing because they have not been converted -- # to use the new interface. - if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ +- DRI_DIRS="i915 i965 nouveau r200 radeon swrast" +- fi + case "$host_cpu" in + x86_64|ia64) + # i810 is missing because there is no x86-64 system where it + # could *ever* be used. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ - unichrome savage sis swrast" -- fi ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + i*86) + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ -+ unichrome savage sis swrast" ++ DRI_DIRS="i915 i965 nouveau r200 radeon swrast" + fi + ;; + powerpc*) + # Build only the drivers for cards that exist on PowerPC. + # At some point MGA will be added, but not yet. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast" -+ fi ++ DRI_DIRS="r200 radeon swrast" ++ fi + ;; + sparc*) + # Build only the drivers for cards that exist on SPARC. + if test "x$DRI_DIRS" = "xyes"; then -+ DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast" ++ DRI_DIRS="r200 radeon swrast" + fi + ;; + esac ++ ;; gnu*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" +@@ -21684,6 +21717,81 @@ + if test "x$enable_gbm" = xyes; then + SRC_DIRS="$SRC_DIRS gbm" + ++ case "$host_os" in ++ *freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 ++$as_echo_n "checking for LIBDEVQ... " >&6; } ++ ++if test -n "$LIBDEVQ_CFLAGS"; then ++ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LIBDEVQ_LIBS"; then ++ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ else ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBDEVQ_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "gbm needs libdevq" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ as_fn_error $? "gbm needs libdevq" "$LINENO" 5 ++else ++ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS ++ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ;; ++ *) + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +@@ -21755,6 +21863,8 @@ + $as_echo "yes" >&6; } + + fi ++ ;; ++ esac + + if test "x$enable_dri" = xyes; then + GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri" +@@ -21763,7 +21873,14 @@ + fi + fi + fi +-GBM_PC_REQ_PRIV="libudev" ++case "$host_os" in ++*freebsd*) ++ GBM_PC_REQ_PRIV="libdevq-1.0" ++ ;; ++*) ++ GBM_PC_REQ_PRIV="libudev" ++ ;; ++esac + GBM_PC_LIB_PRIV="$DLOPEN_LIBS" + + +@@ -21782,6 +21899,81 @@ + + if test "$enable_static" != yes; then + # build egl_glx when libGL is built ++ case "$host_os" in ++ *freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 ++$as_echo_n "checking for LIBDEVQ... " >&6; } ++ ++if test -n "$LIBDEVQ_CFLAGS"; then ++ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LIBDEVQ_LIBS"; then ++ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ else ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBDEVQ_PKG_ERRORS" >&5 ++ ++ have_libdevq=no ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ have_libdevq=no ++else ++ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS ++ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ have_libdevq=yes ++fi ++ ;; ++ *) + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +@@ -21853,8 +22045,12 @@ + $as_echo "yes" >&6; } + have_libudev=yes + fi ++ ;; ++ esac + if test "$have_libudev" = yes; then + DEFINES="$DEFINES -DHAVE_LIBUDEV" ++ elif test "$have_libdevq" = yes; then ++ DEFINES="$DEFINES -DHAVE_LIBDEVQ" + fi + + if test "x$enable_dri" = xyes; then +@@ -23053,9 +23249,19 @@ + ;; + esac + +- case "$plat$have_libudev" in +- waylandno|drmno) +- as_fn_error $? "cannot build $plat platfrom without udev" "$LINENO" 5 ;; ++ case "$host_os" in ++ *freebsd*) ++ case "$plat$have_libdevq" in ++ waylandno|drmno) ++ as_fn_error $? "cannot build $plat platfrom without libdevq" "$LINENO" 5 ;; ++ esac ++ ;; ++ *) ++ case "$plat$have_libudev" in ++ waylandno|drmno) ++ as_fn_error $? "cannot build $plat platfrom without udev" "$LINENO" 5 ;; ++ esac ++ ;; + esac + done + +@@ -23348,29 +23554,6 @@ + CLANG_LIBDIR=${LLVM_LIBDIR} + fi + CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} +- as_ac_File=`$as_echo "ac_cv_file_"$CLANG_RESOURCE_DIR/include/stddef.h"" | $as_tr_sh` +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for \"$CLANG_RESOURCE_DIR/include/stddef.h\"" >&5 +-$as_echo_n "checking for \"$CLANG_RESOURCE_DIR/include/stddef.h\"... " >&6; } +-if eval \${$as_ac_File+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r ""$CLANG_RESOURCE_DIR/include/stddef.h""; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-eval ac_res=\$$as_ac_File +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-if eval test \"x\$"$as_ac_File"\" = x"yes"; then : +- +-else +- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5 +-fi +- + fi + else + MESA_LLVM=0 +@@ -23453,6 +23636,81 @@ + + gallium_require_drm_loader() { + if test "x$enable_gallium_loader" = xyes; then ++ case "$host_os" in ++ *freebsd*) ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 ++$as_echo_n "checking for LIBDEVQ... " >&6; } ++ ++if test -n "$LIBDEVQ_CFLAGS"; then ++ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$LIBDEVQ_LIBS"; then ++ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libdevq-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ else ++ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBDEVQ_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Gallium drm loader requires libdevq" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ as_fn_error $? "Gallium drm loader requires libdevq" "$LINENO" 5 ++else ++ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS ++ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++fi ++ ;; ++ *) + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5 +@@ -23524,6 +23782,8 @@ + $as_echo "yes" >&6; } + + fi ++ ;; ++ esac + if test "x$have_libdrm" != xyes; then + as_fn_error $? "Gallium drm loader requires libdrm >= $LIBDRM_REQUIRED" "$LINENO" 5 + fi +@@ -23534,7 +23794,7 @@ + radeon_llvm_check() { + LLVM_REQUIRED_VERSION_MAJOR="3" + LLVM_REQUIRED_VERSION_MINOR="2" +- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then ++ if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then + as_fn_error $? "LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR with R600 target enabled is required. + To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master diff --git a/graphics/libGL/files-old/patch-mach64_context.h b/graphics/libGL/files-old/patch-mach64_context.h deleted file mode 100644 index 9e3b38e357cd..000000000000 --- a/graphics/libGL/files-old/patch-mach64_context.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/mesa/drivers/dri/mach64/mach64_context.h.orig 2012-06-27 19:59:32.000000000 +0200 -+++ src/mesa/drivers/dri/mach64/mach64_context.h 2012-06-27 20:08:30.000000000 +0200 -@@ -294,11 +294,14 @@ - #define LE32_OUT( x, y ) do { *(GLuint *)(x) = (y); } while (0) - #define LE32_OUT_FLOAT( x, y ) do { *(GLfloat *)(x) = (y); } while (0) - #else --#ifndef __OpenBSD__ --#include <byteswap.h> --#else -+#if defined(__OpenBSD__) - #include <machine/endian.h> - #define bswap_32 bswap32 -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+#define bswap_32 bswap32 -+#else -+#include <byteswap.h> - #endif - - #define LE32_IN( x ) bswap_32( *(GLuint *)(x) ) diff --git a/graphics/libGL/files-old/patch-src-glsl_ir_constant_expression.cpp b/graphics/libGL/files-old/patch-src-glsl_ir_constant_expression.cpp new file mode 100644 index 000000000000..8df40432dfc9 --- /dev/null +++ b/graphics/libGL/files-old/patch-src-glsl_ir_constant_expression.cpp @@ -0,0 +1,14 @@ +--- src/glsl/ir_constant_expression.cpp.orig 2011-07-23 15:08:44.000000000 +0200 ++++ src/glsl/ir_constant_expression.cpp 2011-07-23 15:09:03.000000000 +0200 +@@ -39,6 +39,11 @@ + #include "ir_visitor.h" + #include "glsl_types.h" + ++#include <sys/param.h> ++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027) ++#define log2(x) (log(x) / log(2)) ++#endif ++ + static float + dot(ir_constant *op0, ir_constant *op1) + { diff --git a/graphics/libGL/files-old/patch-src__egl__drivers__dri2__Makefile.in b/graphics/libGL/files-old/patch-src__egl__drivers__dri2__Makefile.in new file mode 100644 index 000000000000..50ca60d9aff5 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__egl__drivers__dri2__Makefile.in @@ -0,0 +1,21 @@ +--- src/egl/drivers/dri2/Makefile.in.orig 2014-05-20 21:03:39.000000000 +0200 ++++ src/egl/drivers/dri2/Makefile.in 2014-05-20 21:14:20.000000000 +0200 +@@ -289,6 +289,8 @@ + LIBTOOL = @LIBTOOL@ + LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ + LIBUDEV_LIBS = @LIBUDEV_LIBS@ ++LIBDEVQ_CFLAGS= @LIBDEVQ_CFLAGS@ ++LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ + LIB_DIR = @LIB_DIR@ + LIPO = @LIPO@ + LLVM_BINDIR = @LLVM_BINDIR@ +@@ -455,7 +457,8 @@ + -I$(top_srcdir)/src/egl/wayland/wayland-egl \ + -I$(top_srcdir)/src/egl/wayland/wayland-drm \ + -I$(top_builddir)/src/egl/wayland/wayland-drm $(DEFINES) \ +- $(LIBDRM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBKMS_CFLAGS) \ ++ $(LIBDRM_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBDEVQ_CFLAGS) \ ++ $(LIBKMS_CFLAGS) \ + -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \ + $(am__append_1) $(am__append_3) $(am__append_5) \ + $(am__append_7) diff --git a/graphics/libGL/files-old/patch-src__egl__drivers__dri2__common.c b/graphics/libGL/files-old/patch-src__egl__drivers__dri2__common.c new file mode 100644 index 000000000000..73c4f8169d5b --- /dev/null +++ b/graphics/libGL/files-old/patch-src__egl__drivers__dri2__common.c @@ -0,0 +1,87 @@ +--- src/egl/drivers/dri2/common.c.orig 2012-11-24 18:57:41.000000000 +0100 ++++ src/egl/drivers/dri2/common.c 2014-03-02 11:36:35.000000000 +0100 +@@ -35,11 +35,11 @@ + + #include "egl_dri2.h" + +-#ifdef HAVE_LIBUDEV +- + #define DRIVER_MAP_DRI2_ONLY + #include "pci_ids/pci_id_driver_map.h" + ++#ifdef HAVE_LIBUDEV ++ + #include <libudev.h> + + static struct udev_device * +@@ -141,4 +141,70 @@ + return driver; + } + ++#elif defined(HAVE_LIBDEVQ) ++ ++#include <libdevq.h> ++#include <stdlib.h> ++ ++char * ++dri2_get_device_name_for_fd(int fd) ++{ ++ int ret; ++ char *device_name = NULL; ++ size_t device_name_len; ++ ++ ret = devq_device_get_devpath_from_fd(fd, ++ NULL, &device_name_len); ++ if (ret < 0) ++ return (NULL); ++ ++ device_name = malloc(device_name_len + 1); ++ ret = devq_device_get_devpath_from_fd(fd, ++ device_name, &device_name_len); ++ if (ret < 0) { ++ free(device_name); ++ return (NULL); ++ } ++ ++ device_name[device_name_len] = '\0'; ++ ++ return device_name; ++} ++ ++char * ++dri2_get_driver_for_fd(int fd) ++{ ++ int ret; ++ char *driver = NULL; ++ int vendor_id, chip_id, i, j; ++ ++ ret = devq_device_get_pciid_from_fd(fd, &vendor_id, &chip_id); ++ if (ret < 0) { ++ _eglLog(_EGL_WARNING, "EGL-DRI2: malformed or no PCI ID"); ++ goto out; ++ } ++ ++ for (i = 0; driver_map[i].driver; i++) { ++ if (vendor_id != driver_map[i].vendor_id) ++ continue; ++ if (driver_map[i].num_chips_ids == -1) { ++ driver = strdup(driver_map[i].driver); ++ _eglLog(_EGL_DEBUG, "pci id for %d: %04x:%04x, driver %s", ++ fd, vendor_id, chip_id, driver); ++ goto out; ++ } ++ ++ for (j = 0; j < driver_map[i].num_chips_ids; j++) ++ if (driver_map[i].chip_ids[j] == chip_id) { ++ driver = strdup(driver_map[i].driver); ++ _eglLog(_EGL_DEBUG, "pci id for %d: %04x:%04x, driver %s", ++ fd, vendor_id, chip_id, driver); ++ goto out; ++ } ++ } ++ ++out: ++ return driver; ++} ++ + #endif /* HAVE_LIBUDEV */ diff --git a/graphics/libGL/files-old/patch-src__egl__drivers__glx__Makefile.in b/graphics/libGL/files-old/patch-src__egl__drivers__glx__Makefile.in new file mode 100644 index 000000000000..701071759daf --- /dev/null +++ b/graphics/libGL/files-old/patch-src__egl__drivers__glx__Makefile.in @@ -0,0 +1,19 @@ +--- src/egl/drivers/glx/Makefile.in.orig 2014-05-20 21:15:30.000000000 +0200 ++++ src/egl/drivers/glx/Makefile.in 2014-05-20 21:16:33.000000000 +0200 +@@ -273,6 +273,8 @@ + LIBTOOL = @LIBTOOL@ + LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ + LIBUDEV_LIBS = @LIBUDEV_LIBS@ ++LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@ ++LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ + LIB_DIR = @LIB_DIR@ + LIPO = @LIPO@ + LLVM_BINDIR = @LLVM_BINDIR@ +@@ -442,6 +444,7 @@ + noinst_LTLIBRARIES = libegl_glx.la + libegl_glx_la_SOURCES = egl_glx.c + libegl_glx_la_LIBADD = \ ++ $(LIBDEVQ_LIBS) \ + $(EGL_LIB_DEPS) + + all: all-am diff --git a/graphics/libGL/files-old/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c b/graphics/libGL/files-old/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c new file mode 100644 index 000000000000..071391b49d98 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c @@ -0,0 +1,43 @@ +--- ./src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c 2014-02-15 21:11:55.000000000 +0100 +@@ -32,7 +32,14 @@ + + #include <fcntl.h> + #include <stdio.h> ++ ++#if defined(HAVE_LIBUDEV) + #include <libudev.h> ++#elif defined(HAVE_LIBDEVQ) ++#include <libdevq.h> ++#include <stdlib.h> ++#endif ++ + #include <xf86drm.h> + + #ifdef HAVE_PIPE_LOADER_XCB +@@ -62,6 +69,7 @@ + static boolean + find_drm_pci_id(struct pipe_loader_drm_device *ddev) + { ++#if defined(HAVE_LIBUDEV) + struct udev *udev = NULL; + struct udev_device *parent, *device = NULL; + struct stat stat; +@@ -100,6 +108,17 @@ + udev_unref(udev); + + return FALSE; ++#elif defined(HAVE_LIBDEVQ) ++ int ret; ++ ++ ret = devq_device_get_pciid_from_fd(ddev->fd, ++ &ddev->base.u.pci.vendor_id, ++ &ddev->base.u.pci.chip_id); ++ if (ret < 0) ++ return FALSE; ++ ++ return TRUE; ++#endif + } + + static boolean diff --git a/graphics/libGL/files-old/patch-src__gallium__include__pipe__p_config.h b/graphics/libGL/files-old/patch-src__gallium__include__pipe__p_config.h new file mode 100644 index 000000000000..be72edbcf99b --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__include__pipe__p_config.h @@ -0,0 +1,16 @@ +--- ./src/gallium/include/pipe/p_config.h.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gallium/include/pipe/p_config.h 2014-02-15 21:11:34.000000000 +0100 +@@ -81,6 +81,13 @@ + #define PIPE_CC_SUNPRO + #endif + ++#if defined(__sparc__) || defined(__sparc64__) ++#define PIPE_ARCH_SPARC ++#if defined(__sparc64__) ++#define PIPE_ARCH_SPARC_64 ++#endif ++#endif ++ + + /* + * Processor architecture diff --git a/graphics/libGL/files-old/patch-src__gallium__state_trackers__egl__drm__native_drm.c b/graphics/libGL/files-old/patch-src__gallium__state_trackers__egl__drm__native_drm.c new file mode 100644 index 000000000000..701b7fcf0558 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__state_trackers__egl__drm__native_drm.c @@ -0,0 +1,42 @@ +--- ./src/gallium/state_trackers/egl/drm/native_drm.c.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gallium/state_trackers/egl/drm/native_drm.c 2014-02-15 21:11:55.000000000 +0100 +@@ -35,8 +35,11 @@ + + #include "gbm_gallium_drmint.h" + +-#ifdef HAVE_LIBUDEV ++#if defined(HAVE_LIBUDEV) + #include <libudev.h> ++#elif defined(HAVE_LIBDEVQ) ++#include <libdevq.h> ++#include <stdlib.h> + #endif + + static boolean +@@ -183,8 +186,26 @@ + udev_device_unref(device); + outudev: + udev_unref(udev); ++#elif defined(HAVE_LIBDEVQ) ++ int ret; ++ size_t device_name_len; + ++ ret = devq_device_get_devpath_from_fd(fd, ++ NULL, &device_name_len); ++ if (ret < 0) ++ return (NULL); ++ ++ device_name = malloc(device_name_len + 1); ++ ret = devq_device_get_devpath_from_fd(fd, ++ device_name, &device_name_len); ++ if (ret < 0) { ++ free(device_name); ++ return (NULL); ++ } ++ ++ device_name[device_name_len] = '\0'; + #endif ++ + return device_name; + } + diff --git a/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c b/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c new file mode 100644 index 000000000000..367424c73d98 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c @@ -0,0 +1,52 @@ +--- src/gallium/state_trackers/xvmc/tests/xvmc_bench.c.orig 2013-10-05 03:59:22.000000000 +0000 ++++ src/gallium/state_trackers/xvmc/tests/xvmc_bench.c 2014-10-16 13:46:30.000000000 +0000 +@@ -27,9 +27,10 @@ + + #include <assert.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> +-#include <error.h> + #include <sys/time.h> ++#include <unistd.h> + #include "testlib.h" + + #define MACROBLOCK_WIDTH 16 +@@ -144,23 +145,10 @@ + } + + if (fail) +- error +- ( +- 1, 0, +- "Bad argument.\n" +- "\n" +- "Usage: %s [options]\n" +- "\t-iw <width>\tInput width\n" +- "\t-ih <height>\tInput height\n" +- "\t-ow <width>\tOutput width\n" +- "\t-oh <height>\tOutput height\n" +- "\t-p <pipeline>\tPipeline to test\n" +- "\t-mb <mb type>\tMacroBlock types to use\n" +- "\t-r <reps>\tRepetitions\n\n" +- "\tPipeline steps: mc,csc,swap\n" +- "\tMB types: i,p,b\n", +- argv[0] +- ); ++ { ++ printf ("error happened\n"); ++ exit(1); ++ } + + if (config->output_width == 0) + config->output_width = config->input_width; +@@ -214,7 +202,8 @@ + )) + { + XCloseDisplay(display); +- error(1, 0, "Error, unable to find a good port.\n"); ++ printf("Error, unable to find a good port.\n"); ++ exit(1); + } + + if (is_overlay) diff --git a/graphics/libGL/files-old/patch-src__gallium__targets__egl-static__egl.c b/graphics/libGL/files-old/patch-src__gallium__targets__egl-static__egl.c new file mode 100644 index 000000000000..225cdc49c4ab --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__targets__egl-static__egl.c @@ -0,0 +1,37 @@ +--- ./src/gallium/targets/egl-static/egl.c.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gallium/targets/egl-static/egl.c 2014-02-15 21:11:55.000000000 +0100 +@@ -29,9 +29,12 @@ + #include "egldriver.h" + #include "egllog.h" + +-#ifdef HAVE_LIBUDEV ++#if defined(HAVE_LIBUDEV) + #include <stdio.h> /* for sscanf */ + #include <libudev.h> ++#elif defined(HAVE_LIBDEVQ) ++#include <libdevq.h> ++#include <stdlib.h> + #endif + + #define DRIVER_MAP_GALLIUM_ONLY +@@ -108,6 +111,20 @@ + return (*chip_id >= 0); + } + ++#elif defined(HAVE_LIBDEVQ) ++ ++static boolean ++drm_fd_get_pci_id(int fd, int *vendor_id, int *chip_id) ++{ ++ int ret; ++ ++ ret = devq_device_get_pciid_from_fd(fd, vendor_id, chip_id); ++ if (ret < 0) ++ return FALSE; ++ ++ return TRUE; ++} ++ + #elif defined(PIPE_OS_ANDROID) && !defined(_EGL_NO_DRM) + + #include <xf86drm.h> diff --git a/graphics/libGL/files-old/patch-src__gallium__targets__gbm__Makefile.in b/graphics/libGL/files-old/patch-src__gallium__targets__gbm__Makefile.in new file mode 100644 index 000000000000..dd55acc5ad24 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gallium__targets__gbm__Makefile.in @@ -0,0 +1,29 @@ +--- src/gallium/targets/gbm/Makefile.in.orig 2014-03-02 12:23:28.000000000 +0100 ++++ src/gallium/targets/gbm/Makefile.in 2014-03-02 12:23:59.000000000 +0100 +@@ -157,7 +157,7 @@ + $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_2) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + am_gbm_gallium_drm_la_OBJECTS = gbm.lo + gbm_gallium_drm_la_OBJECTS = $(am_gbm_gallium_drm_la_OBJECTS) + AM_V_P = $(am__v_P_@AM_V@) +@@ -554,6 +554,7 @@ + AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(LIBUDEV_CFLAGS) \ ++ $(LIBDEVQ_CFLAGS) \ + $(LIBDRM_CFLAGS) + + gbm_LTLIBRARIES = gbm_gallium_drm.la +@@ -561,7 +562,8 @@ + gbm_gallium_drm_la_LIBADD = $(GALLIUM_PIPE_LOADER_LIBS) \ + $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ +- $(LIBUDEV_LIBS) $(LIBDRM_LIBS) -lm $(am__append_1) ++ $(LIBUDEV_LIBS) $(LIBDEVQ_LIBS) $(LIBDRM_LIBS) -lm \ ++ $(am__append_1) + gbm_gallium_drm_la_LDFLAGS = -no-undefined -avoid-version -module \ + $(am__append_2) + @HAVE_MESA_LLVM_FALSE@gbm_gallium_drm_la_LINK = $(CXXLINK) $(gbm_gallium_drm_la_LDFLAGS) diff --git a/graphics/libGL/files-old/patch-src__gbm__Makefile.in b/graphics/libGL/files-old/patch-src__gbm__Makefile.in new file mode 100644 index 000000000000..07e196e31dc4 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gbm__Makefile.in @@ -0,0 +1,42 @@ +--- src/gbm/Makefile.in.orig 2014-05-20 21:18:10.000000000 +0200 ++++ src/gbm/Makefile.in 2014-05-20 21:19:09.000000000 +0200 +@@ -107,7 +107,7 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + libgbm_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__append_2) ++ $(am__DEPENDENCIES_1) $(am__append_2) + am_libgbm_la_OBJECTS = gbm.lo backend.lo common.lo + libgbm_la_OBJECTS = $(am_libgbm_la_OBJECTS) + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -303,6 +303,8 @@ + LIBTOOL = @LIBTOOL@ + LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@ + LIBUDEV_LIBS = @LIBUDEV_LIBS@ ++LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@ ++LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ + LIB_DIR = @LIB_DIR@ + LIPO = @LIPO@ + LLVM_BINDIR = @LLVM_BINDIR@ +@@ -467,8 +469,8 @@ + pkgconfig_DATA = main/gbm.pc + AM_CFLAGS = -D_OS_UNIX=1 -DMODULEDIR='"$(libdir)/gbm"' \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/gbm/main \ +- $(LIBUDEV_CFLAGS) $(LIBKMS_CFLAGS) $(DLOPEN_CFLAGS) $(DEFINES) \ +- $(am__append_1) ++ $(LIBUDEV_CFLAGS) $(LIBDEVQ_CFLAGS) $(LIBKMS_CFLAGS) \ ++ $(DLOPEN_CFLAGS) $(DEFINES) $(am__append_1) + lib_LTLIBRARIES = libgbm.la + include_HEADERS = main/gbm.h + libgbm_la_SOURCES = \ +@@ -477,8 +479,8 @@ + main/common.c + + libgbm_la_LDFLAGS = -version-info 1:0 +-libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) \ +- $(am__append_2) ++libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBDEVQ_LIBS) $(LIBKMS_LIBS) \ ++ $(DLOPEN_LIBS) $(am__append_2) + @HAVE_EGL_PLATFORM_WAYLAND_TRUE@AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM + @HAVE_DRI_TRUE@noinst_LTLIBRARIES = libgbm_dri.la + @HAVE_DRI_TRUE@libgbm_dri_la_SOURCES = \ diff --git a/graphics/libGL/files-old/patch-src__gbm__backends__dri__driver_name.c b/graphics/libGL/files-old/patch-src__gbm__backends__dri__driver_name.c new file mode 100644 index 000000000000..ac73872f94ff --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gbm__backends__dri__driver_name.c @@ -0,0 +1,53 @@ +--- ./src/gbm/backends/dri/driver_name.c.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gbm/backends/dri/driver_name.c 2014-02-15 21:11:55.000000000 +0100 +@@ -29,7 +29,12 @@ + #include <stdio.h> + #include <string.h> + ++#if defined(HAVE_LIBUDEV) + #include <libudev.h> ++#elif defined(HAVE_LIBDEVQ) ++#include <libdevq.h> ++#include <stdlib.h> ++#endif + + #include "gbm_driint.h" + #define DRIVER_MAP_DRI2_ONLY +@@ -38,10 +43,12 @@ + char * + dri_fd_get_driver_name(int fd) + { ++ char *driver = NULL; ++ ++#if defined(HAVE_LIBUDEV) + struct udev *udev; + struct udev_device *device, *parent; + const char *pci_id; +- char *driver = NULL; + int vendor_id, chip_id, i, j; + + udev = udev_new(); +@@ -84,6 +91,23 @@ + out: + udev_device_unref(device); + udev_unref(udev); ++#elif defined(HAVE_LIBDEVQ) ++ int ret; ++ size_t driver_len; ++ ++ ret = devq_device_drm_get_drvname_from_fd(fd, NULL, &driver_len); ++ if (ret < 0) ++ return (NULL); ++ ++ driver = malloc(driver_len + 1); ++ ret = devq_device_drm_get_drvname_from_fd(fd, driver, &driver_len); ++ if (ret < 0) { ++ free(driver); ++ return (NULL); ++ } ++ ++ driver[driver_len] = '\0'; ++#endif + + return driver; + } diff --git a/graphics/libGL/files-old/patch-src__gbm__main__common.c b/graphics/libGL/files-old/patch-src__gbm__main__common.c new file mode 100644 index 000000000000..662d0229694b --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gbm__main__common.c @@ -0,0 +1,69 @@ +--- ./src/gbm/main/common.c.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gbm/main/common.c 2014-02-15 21:11:55.000000000 +0100 +@@ -28,7 +28,13 @@ + #include <stdio.h> + #include <string.h> + ++#if defined(HAVE_LIBUDEV) + #include <libudev.h> ++#elif defined(HAVE_LIBDEVQ) ++#include <libdevq.h> ++#include <stdlib.h> ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + #include <unistd.h> +@@ -36,6 +42,7 @@ + #include "common.h" + #include "gbmint.h" + ++#if defined(HAVE_LIBUDEV) + GBM_EXPORT struct udev_device * + _gbm_udev_device_new_from_fd(struct udev *udev, int fd) + { +@@ -56,14 +63,17 @@ + + return device; + } ++#endif /* defined(HAVE_LIBUDEV) */ + + GBM_EXPORT char * + _gbm_fd_get_device_name(int fd) + { ++ char *device_name = NULL; ++ ++#if defined(HAVE_LIBUDEV) + struct udev *udev; + struct udev_device *device; + const char *const_device_name; +- char *device_name = NULL; + + udev = udev_new(); + device = _gbm_udev_device_new_from_fd(udev, fd); +@@ -78,6 +88,25 @@ + out: + udev_device_unref(device); + udev_unref(udev); ++#elif defined(HAVE_LIBDEVQ) ++ int ret; ++ size_t device_name_len; ++ ++ ret = devq_device_get_devpath_from_fd(fd, ++ NULL, &device_name_len); ++ if (ret < 0) ++ return (NULL); ++ ++ device_name = malloc(device_name_len + 1); ++ ret = devq_device_get_devpath_from_fd(fd, ++ device_name, &device_name_len); ++ if (ret < 0) { ++ free(device_name); ++ return (NULL); ++ } ++ ++ device_name[device_name_len] = '\0'; ++#endif + + return device_name; + } diff --git a/graphics/libGL/files-old/patch-src__gbm__main__common.h b/graphics/libGL/files-old/patch-src__gbm__main__common.h new file mode 100644 index 000000000000..cd870e508167 --- /dev/null +++ b/graphics/libGL/files-old/patch-src__gbm__main__common.h @@ -0,0 +1,15 @@ +--- ./src/gbm/main/common.h.orig 2014-02-03 18:42:39.000000000 +0100 ++++ ./src/gbm/main/common.h 2014-02-15 21:11:55.000000000 +0100 +@@ -28,10 +28,12 @@ + #ifndef _COMMON_H_ + #define _COMMON_H_ + ++#if defined(HAVE_LIBUDEV) + #include <libudev.h> + + struct udev_device * + _gbm_udev_device_new_from_fd(struct udev *udev, int fd); ++#endif + + char * + _gbm_fd_get_device_name(int fd); diff --git a/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S deleted file mode 100644 index 908a6fe300aa..000000000000 --- a/graphics/libGL/files-old/patch-src__mesa__x86-64__glapi_x86-64.S +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/mesa/x86-64/glapi_x86-64.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86-64/glapi_x86-64.S 2011-01-28 18:12:18.000000000 +0100 -@@ -73,7 +73,8 @@ _x86_64_get_dispatch: - - .p2align 4,,15 - _x86_64_get_dispatch: -- movq _gl_DispatchTSD(%rip), %rdi -+ movq _gl_DispatchTSD@GOTPCREL(%rip), %rax -+ movl (%rax), %edi - jmp pthread_getspecific@PLT - - #elif defined(THREADS) diff --git a/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S b/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S deleted file mode 100644 index 193e6cc30fbe..000000000000 --- a/graphics/libGL/files-old/patch-src__mesa__x86-64__xform4.S +++ /dev/null @@ -1,74 +0,0 @@ ---- src/mesa/x86-64/xform4.S.orig 2009-01-22 18:38:35.000000000 +0100 -+++ src/mesa/x86-64/xform4.S 2011-05-09 21:26:00.000000000 +0200 -@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general: - * rdx = source - */ - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -116,7 +116,7 @@ p4_constants: - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 --.float 0f+1.0 -+.float 1.0 - - .text - .align 16 -@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d: - movaps 16(%rax), %xmm10 - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -195,7 +195,7 @@ p4_3d_done: - _mesa_x86_64_transform_points4_identity: - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -223,7 +223,7 @@ p4_identity_done: - _mesa_3dnow_transform_points4_3d_no_rot: - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -287,7 +287,7 @@ p4_3d_no_rot_done: - _mesa_3dnow_transform_points4_perspective: - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -353,7 +353,7 @@ p4_perspective_done: - _mesa_3dnow_transform_points4_2d_no_rot: - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ -@@ -408,7 +408,7 @@ p4_2d_no_rot_done: - _mesa_3dnow_transform_points4_2d: - - movl V4F_COUNT(%rdx), %ecx /* count */ -- movzx V4F_STRIDE(%rdx), %eax /* stride */ -+ movzbl V4F_STRIDE(%rdx), %eax /* stride */ - - movl %ecx, V4F_COUNT(%rdi) /* set dest count */ - movl $4, V4F_SIZE(%rdi) /* set dest size */ diff --git a/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S b/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S deleted file mode 100644 index 71da78c83ffd..000000000000 --- a/graphics/libGL/files-old/patch-src__mesa__x86__glapi_x86.S +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/glapi_x86.S.orig 2009-03-13 04:28:49.000000000 +0100 -+++ ./src/mesa/x86/glapi_x86.S 2011-01-28 18:11:56.000000000 +0100 -@@ -47,7 +47,7 @@ - #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX)) - - #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) --#define GLOBL_FN(x) GLOBL x ; .type x, function -+#define GLOBL_FN(x) GLOBL x ; .type x, @function - #else - #define GLOBL_FN(x) GLOBL x - #endif diff --git a/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S deleted file mode 100644 index 37b08d1cda3c..000000000000 --- a/graphics/libGL/files-old/patch-src__mesa__x86__read_rgba_span_x86.S +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/mesa/x86/read_rgba_span_x86.S.orig 2008-08-25 16:46:47.000000000 +0200 -+++ ./src/mesa/x86/read_rgba_span_x86.S 2011-01-28 18:10:06.000000000 +0100 -@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX: - testl $0x01, %ecx - je .L01 - -- movzxw (%eax), %ecx -+ movzwl (%eax), %ecx - movd %ecx, %mm4 - - pshufw $0x00, %mm4, %mm0 diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_r300_r300-chipset.c b/graphics/libGL/files-old/patch-src_gallium_drivers_r300_r300-chipset.c new file mode 100644 index 000000000000..821b07ce8be2 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_r300_r300-chipset.c @@ -0,0 +1,26 @@ +diff --git a/src/gallium/drivers/r300/r300_chipset.c b/src/gallium/drivers/r300/r300_chipset.c +index 11061ed..daf990e 100644 +--- src/gallium/drivers/r300/r300_chipset.c ++++ src/gallium/drivers/r300/r300_chipset.c +@@ -48,6 +48,21 @@ static void r300_apply_hyperz_blacklist(struct r300_capabilities* caps) + }; + int i; + ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++ const char *progname, *program_invocation_short_name; ++ ++ progname = getprogname(); ++ program_invocation_short_name = strrchr(progname, '/'); ++ if (program_invocation_short_name) { ++ program_invocation_short_name++; ++ } else { ++ program_invocation_short_name = progname; ++ } ++#endif ++ + for (i = 0; i < Elements(list); i++) { + if (strcmp(list[i], program_invocation_short_name) == 0) { + caps->zmask_ram = 0; diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-asm.c b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-asm.c new file mode 100644 index 000000000000..3b580dd81030 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-asm.c @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_asm.c.orig 2013-03-20 00:28:25.000000000 +0100 ++++ src/gallium/drivers/r600/r600_asm.c 2013-06-26 23:29:14.000000000 +0200 +@@ -27,7 +27,12 @@ + #include "r600d.h" + + #include <errno.h> ++#if defined(__linux__) + #include <byteswap.h> ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/endian.h> ++#define bswap_32(x) bswap32((x)) ++#endif + #include "util/u_memory.h" + #include "pipe/p_shader_tokens.h" + diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-shader.c b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-shader.c new file mode 100644 index 000000000000..3721b25cd83b --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600-shader.c @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_shader.c.orig 2013-05-16 19:38:54.000000000 +0200 ++++ src/gallium/drivers/r600/r600_shader.c 2013-06-26 23:26:02.000000000 +0200 +@@ -35,7 +35,12 @@ + #include "util/u_memory.h" + #include <stdio.h> + #include <errno.h> ++#if defined(__linux__) + #include <byteswap.h> ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/endian.h> ++#define bswap_32(x) bswap32((x)) ++#endif + + /* CAYMAN notes + Why CAYMAN got loops for lots of instructions is explained here. diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600_state_common.c b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600_state_common.c new file mode 100644 index 000000000000..f7ad4caea427 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_r600_r600_state_common.c @@ -0,0 +1,15 @@ +--- src/gallium/drivers/r600/r600_state_common.c.orig 2013-03-06 00:25:39.000000000 +0100 ++++ src/gallium/drivers/r600/r600_state_common.c 2013-06-26 23:26:02.000000000 +0200 +@@ -33,7 +33,12 @@ + #include "util/u_memory.h" + #include "util/u_upload_mgr.h" + #include "tgsi/tgsi_parse.h" ++#if defined(__linux__) + #include <byteswap.h> ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/endian.h> ++#define bswap_32(x) bswap32((x)) ++#endif + + #define R600_PRIM_RECTANGLE_LIST PIPE_PRIM_MAX + diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp b/graphics/libGL/files-old/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp new file mode 100644 index 000000000000..ee67776d839e --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_radeon_radeon-llvm-emit.cpp @@ -0,0 +1,28 @@ +--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp.orig 2013-08-19 21:23:06.000000000 +0200 ++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-08-19 21:30:58.000000000 +0200 +@@ -25,13 +25,13 @@ + */ + #include "radeon_llvm_emit.h" + +-#include <llvm/LLVMContext.h> +-#include <llvm/Module.h> ++#include <llvm/IR/LLVMContext.h> ++#include <llvm/IR/Module.h> + #include <llvm/PassManager.h> + #include <llvm/ADT/Triple.h> + #include <llvm/Support/FormattedStream.h> + #include <llvm/Support/Host.h> +-#include <llvm/Support/IRReader.h> ++#include <llvm/IRReader/IRReader.h> + #include <llvm/Support/SourceMgr.h> + #include <llvm/Support/TargetRegistry.h> + #include <llvm/Support/TargetSelect.h> +@@ -39,7 +39,7 @@ + #include <llvm/Target/TargetMachine.h> + #include <llvm/Transforms/Scalar.h> + #include <llvm-c/Target.h> +-#include <llvm/DataLayout.h> ++#include <llvm/IR/DataLayout.h> + + #include <iostream> + #include <stdlib.h> diff --git a/graphics/libGL/files-old/patch-src_gallium_drivers_radeonsi_r600-buffer.c b/graphics/libGL/files-old/patch-src_gallium_drivers_radeonsi_r600-buffer.c new file mode 100644 index 000000000000..505f3a17f03f --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_drivers_radeonsi_r600-buffer.c @@ -0,0 +1,16 @@ +--- src/gallium/drivers/radeonsi/r600_buffer.c.orig 2013-08-01 00:56:45.000000000 +0200 ++++ src/gallium/drivers/radeonsi/r600_buffer.c 2013-08-19 21:36:02.000000000 +0200 +@@ -24,7 +24,13 @@ + * Jerome Glisse + * Corbin Simpson <MostAwesomeDude@gmail.com> + */ ++ ++#if defined(__linux__) + #include <byteswap.h> ++#elif defined(__FreeBSD__) || defined(__DragonFly__) ++#include <sys/endian.h> ++#define bswap_32(x) bswap32((x)) ++#endif + + #include "pipe/p_screen.h" + #include "util/u_format.h" diff --git a/graphics/libGL/files-old/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c b/graphics/libGL/files-old/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c new file mode 100644 index 000000000000..208601de99a0 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_gallium_winsys_svga_drm_vmw-screen-ioctl.c @@ -0,0 +1,18 @@ +diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +index 36888dc..62a6e6a 100644 +--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c ++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +@@ -66,6 +66,13 @@ struct vmw_region + */ + #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9) + ++#if defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || \ ++ defined(__NetBSD__) || \ ++ defined(__OpenBSD__) ++#define ERESTART EINTR ++#endif ++ + uint32 + vmw_ioctl_context_create(struct vmw_winsys_screen *vws) + { diff --git a/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c b/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c deleted file mode 100644 index 1d082b54e21d..000000000000 --- a/graphics/libGL/files-old/patch-src_glx_x11_XF86dri.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/glx/x11/XF86dri.c.orig 2009-06-17 18:35:16.000000000 +0000 -+++ src/glx/x11/XF86dri.c 2013-05-29 10:09:37.000000000 +0000 -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include <X11/extensions/Xext.h> - #include <X11/extensions/extutil.h> - #include "xf86dristr.h" -+#include <limits.h> - - - #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 -@@ -212,7 +213,11 @@ XF86DRIOpenConnection(Display * dpy, int - } - - if (rep.length) { -- if (!(*busIdString = (char *) Xcalloc(rep.busIdStringLength + 1, 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString = Xcalloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString = NULL; -+ if (*busIdString == NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); -@@ -311,9 +316,11 @@ XF86DRIGetClientDriverName(Display * dpy - *ddxDriverPatchVersion = rep.ddxDriverPatchVersion; - - if (rep.length) { -- if (! -- (*clientDriverName = -- (char *) Xcalloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName = Xcalloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName = NULL; -+ if (*clientDriverName == NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); diff --git a/graphics/libGL/files-old/patch-src_mapi_glapi_gen_gl-gentable.py b/graphics/libGL/files-old/patch-src_mapi_glapi_gen_gl-gentable.py new file mode 100644 index 000000000000..d952bb61cf26 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mapi_glapi_gen_gl-gentable.py @@ -0,0 +1,11 @@ +--- src/mapi/glapi/gen/gl_gentable.py.orig 2013-07-17 15:41:13.000000000 +0200 ++++ src/mapi/glapi/gen/gl_gentable.py 2013-07-17 15:41:55.000000000 +0200 +@@ -42,7 +42,7 @@ + #endif + + #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ +- || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__)) ++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)) + #define USE_BACKTRACE + #endif + diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h new file mode 100644 index 000000000000..13c245eb8cdf --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h @@ -0,0 +1,13 @@ +--- src/mapi/mapi/entry_x86-64_tls.h.orig 2013-10-05 05:59:22.000000000 +0200 ++++ src/mapi/mapi/entry_x86-64_tls.h 2014-07-29 20:28:05.000000000 +0200 +@@ -63,8 +63,8 @@ entry_patch_public(void) + { + } + +-static char +-x86_64_entry_start[]; ++extern char ++x86_64_entry_start[] __attribute__((visibility("hidden"))); + + mapi_func + entry_get_public(int slot) diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h new file mode 100644 index 000000000000..d8a8e24d5eca --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h @@ -0,0 +1,13 @@ +--- src/mapi/mapi/entry_x86_tls.h.orig 2013-10-05 05:59:22.000000000 +0200 ++++ src/mapi/mapi/entry_x86_tls.h 2014-07-29 20:28:05.000000000 +0200 +@@ -73,8 +73,8 @@ __asm__(".text"); + extern unsigned long + x86_current_tls(); + +-static char x86_entry_start[]; +-static char x86_entry_end[]; ++extern char x86_entry_start[] __attribute__((visibility("hidden"))); ++extern char x86_entry_end[] __attribute__((visibility("hidden"))); + + void + entry_patch_public(void) diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h new file mode 100644 index 000000000000..b97cf4cd9fb9 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h @@ -0,0 +1,13 @@ +--- src/mapi/mapi/entry_x86_tsd.h.orig 2013-10-05 05:59:22.000000000 +0200 ++++ src/mapi/mapi/entry_x86_tsd.h 2014-07-29 20:28:05.000000000 +0200 +@@ -60,8 +60,8 @@ __asm__(".balign 32\n" + #include <string.h> + #include "u_execmem.h" + +-static const char x86_entry_start[]; +-static const char x86_entry_end[]; ++extern const char x86_entry_start[] __attribute__((visibility("hidden"))); ++extern const char x86_entry_end[] __attribute__((visibility("hidden"))); + + void + entry_patch_public(void) diff --git a/graphics/libGL/files-old/patch-src_mesa_Makefile b/graphics/libGL/files-old/patch-src_mesa_Makefile deleted file mode 100644 index 433f3fbbf182..000000000000 --- a/graphics/libGL/files-old/patch-src_mesa_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- src/mesa/Makefile.orig 2009-12-22 03:31:19.000000000 +0100 -+++ src/mesa/Makefile 2013-08-19 23:19:42.000000000 +0200 -@@ -127,10 +127,10 @@ - $(DESTDIR)$(INSTALL_INC_DIR)/GL - - install-libgl: default gl.pc install-headers -- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ -- $(DESTDIR)$(INSTALL_LIB_DIR) -+ $(DESTDIR)$(INSTALL_LIB_DIR)/.libGL - $(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig - - install-osmesa: default osmesa.pc diff --git a/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_Makefile.in b/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_Makefile.in new file mode 100644 index 000000000000..1084e90fd805 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_Makefile.in @@ -0,0 +1,17 @@ +--- src/mesa/drivers/dri/common/Makefile.in.orig 2013-04-20 14:50:15.000000000 +0000 ++++ src/mesa/drivers/dri/common/Makefile.in 2013-04-20 15:02:05.000000000 +0000 +@@ -123,11 +123,11 @@ + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(AM_CFLAGS) $(CPPFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) $(CPPFLAGS) \ ++ $(CFLAGS) + AM_V_CC = $(am__v_CC_@AM_V@) + am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) + am__v_CC_0 = @echo " CC " $@; diff --git a/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in b/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in new file mode 100644 index 000000000000..4f2a84b8be96 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in @@ -0,0 +1,11 @@ +--- src/mesa/drivers/dri/common/xmlpool/Makefile.in.orig 2013-07-02 22:42:09.000000000 +0200 ++++ src/mesa/drivers/dri/common/xmlpool/Makefile.in 2013-07-02 22:53:30.000000000 +0200 +@@ -639,7 +639,7 @@ + # Update .mo files from the corresponding .po files. + %/LC_MESSAGES/options.mo: %.po + @mo="$@"; \ +- lang=$${mo%%/*}; \ ++ lang=$*; \ + echo "Updating ($$lang) $@ from $?."; \ + mkdir -p $$lang/LC_MESSAGES; \ + msgfmt -o $@ $? diff --git a/graphics/libGL/files-old/patch-src_mesa_main_compiler.h b/graphics/libGL/files-old/patch-src_mesa_main_compiler.h new file mode 100644 index 000000000000..50cf3a8454f6 --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mesa_main_compiler.h @@ -0,0 +1,12 @@ +--- src/mesa/main/compiler.h.orig 2013-04-06 04:01:09.000000000 +0200 ++++ src/mesa/main/compiler.h 2013-06-26 23:26:02.000000000 +0200 +@@ -171,6 +171,9 @@ + #if defined(__linux__) + #include <byteswap.h> + #define CPU_TO_LE32( x ) bswap_32( x ) ++#elif defined(__FreeBSD__) ++#include <sys/endian.h> ++#define CPU_TO_LE32( x ) bswap32( x ) + #elif defined(__APPLE__) + #include <CoreFoundation/CFByteOrder.h> + #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) diff --git a/graphics/libGL/files-old/patch-src_mesa_main_imports.c b/graphics/libGL/files-old/patch-src_mesa_main_imports.c new file mode 100644 index 000000000000..c5979f7c15fe --- /dev/null +++ b/graphics/libGL/files-old/patch-src_mesa_main_imports.c @@ -0,0 +1,10 @@ +--- src/mesa/main/imports.c.orig 2013-10-05 03:59:22.000000000 +0000 ++++ src/mesa/main/imports.c +@@ -566,6 +566,7 @@ float + _mesa_strtof( const char *s, char **end ) + { + #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ ++ !defined(__DragonFly__) && \ + !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) + static locale_t loc = NULL; + if (!loc) { diff --git a/graphics/libGL/files-old/pkg-deinstall.in b/graphics/libGL/files-old/pkg-deinstall.in new file mode 100644 index 000000000000..37d895397fcb --- /dev/null +++ b/graphics/libGL/files-old/pkg-deinstall.in @@ -0,0 +1,12 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in +DEINSTALL) + /bin/rm -f ${PREFIX}/lib/libGL.so* + ;; +esac diff --git a/graphics/libGL/files-old/pkg-install.in b/graphics/libGL/files-old/pkg-install.in new file mode 100644 index 000000000000..280922c0bbfc --- /dev/null +++ b/graphics/libGL/files-old/pkg-install.in @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +PREFIX="${PKG_PREFIX-/usr/local}" + +case $2 in +POST-INSTALL) + if [ -f ${PREFIX}/lib/.nvidia/libGL.so.1 ]; then + /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/.nvidia/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + else + /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so + /bin/ln -f ${PREFIX}/lib/.libGL/libGL.so.1 ${PREFIX}/lib/libGL.so.1 + fi + ;; +esac |