gentoo resync : 14.07.2018

3 files changed, 91 insertions, 0 deletions

diff --git a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
new file mode 100644
index 000000000000..b5960af5d7d6
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,7 +78,6 @@
+ AC_C_BIGENDIAN
+ AC_C_STRINGIZE
+ 
+-MD_CONF_DEBUGGING
+ MD_CONF_COMPILER
+ AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
+ AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
+--- a/m4/md_check_gcc3.m4
++++ b/m4/md_check_gcc3.m4
+@@ -1,7 +1,7 @@
+ AC_DEFUN([MD_CHECK_GCC3],
+   [
+     if [[ "$GCC" = "yes" ]]; then
+-      ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
++      ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
+       case $ver in
+         *[[^[:digit:]]]*)
+           AC_MSG_WARN([Could not determine compiler version. Trying our luck...])
diff --git a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
new file mode 100644
index 000000000000..aa49205ec75d
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
@@ -0,0 +1,25 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,6 +59,8 @@
+ MD_CHECK_OS
+ 
+ MD_CHECK_LIBUSB018B
++LIBS="$LIBS $LIBUSB_LIBS"
++INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
+ 
+ AC_PROG_CC
+ MD_CHECK_GCC3
+@@ -97,13 +99,6 @@
+ 
+ MD_CHECK_DOXYGEN
+ 
+-MD_CONF_FLAGS(
+-  [],
+-  [$OS_CFLAGS $LIBUSB_CFLAGS],
+-  [],
+-  [$OS_LDFLAGS $LIBUSB_LIBS]
+-)
+-
+ MD_CONF_DB2MAN
+ 
+ ##### OUTPUT #################################################################
diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch
new file mode 100644
index 000000000000..ce5dae7481b9
--- /dev/null
+++ b/dev-libs/libhid/files/libhid-0.2.16-swig.patch
@@ -0,0 +1,45 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,8 +87,8 @@
+ if test "${ac_cv_enable_swig}" = "no" ; then
+   AM_CONDITIONAL(HAVE_SWIG, false)
+ else
+-  AC_PROG_SWIG(1.3)
+-  AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version)
++  AC_CHECK_PROG(SWIG,swig,swig,false)
++  AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version)
+   if test -z "${HAVE_SWIG_TRUE}" ; then
+     AM_PATH_PYTHON
+     SWIG_PYTHON
+--- a/swig/Makefile.am
++++ b/swig/Makefile.am
+@@ -1,7 +1,7 @@
+ # AM_MAKEFLAGS = @MAKEFLAGS@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
++AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
+ AM_CFLAGS = -fPIC -fno-strict-aliasing
+ AM_LDFLAGS = -shared ../src/libhid.la -lusb
+ 
+@@ -29,7 +29,7 @@ __init__.py: hid.py
+ 
+ %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h
+ 	$(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $<
+-	echo '#include <compiler.h>' > tmp.c
++	echo '#include "compiler.h"' > tmp.c
+ 	sed -e 's/PyObject \*self/& UNUSED/' \
+ 	    -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \
+ 	&& mv tmp.c $@
+--- a/swig/hid.i
++++ b/swig/hid.i
+@@ -1,7 +1,7 @@
+ %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid 
+ %{
+-#include <compiler.h>
+-#include <hid.h>
++#include "compiler.h"
++#include "hid.h"
+ %}
+ 
+ %feature("autodoc","0");