pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xf86-input-vmmouse xf86-input-vmmouse: update to 1...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e65565d28143
branches: trunk
changeset: 386472:e65565d28143
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Oct 09 07:41:36 2022 +0000
description:
xf86-input-vmmouse: update to 13.2.0.
Alan Coopersmith (4):
Update "See Also" list in vmmouse_detect man page
Update configure.ac bug URL for gitlab migration
Build xz tarballs instead of bzip2
gitlab CI: add a basic build test
Colin Walters (1):
autogen.sh: Implement GNOME Build API
Emil Velikov (1):
autogen.sh: use quoted string variables
Matt Turner (2):
tools: Fix declaration of xf86EnableIO()
xf86-input-vmmouse 13.2.0
Mihail Konev (1):
autogen: add default patch prefix
Peter Hutterer (2):
Drop maintainer mode from autogen.sh
autogen.sh: use exec instead of waiting for configure to finish
Thomas Klausner (2):
Replace unportable test(1) operator.
Add NetBSD/amd64 support for iopl calls.
diffstat:
x11/xf86-input-vmmouse/Makefile | 7 +-
x11/xf86-input-vmmouse/distinfo | 11 +-
x11/xf86-input-vmmouse/patches/patch-config.h.in | 14 --
x11/xf86-input-vmmouse/patches/patch-configure | 97 --------------
x11/xf86-input-vmmouse/patches/patch-tools_vmmouse__iopl.c | 81 -----------
5 files changed, 7 insertions(+), 203 deletions(-)
diffs (237 lines):
diff -r d6795f0c013d -r e65565d28143 x11/xf86-input-vmmouse/Makefile
--- a/x11/xf86-input-vmmouse/Makefile Sun Oct 09 07:38:04 2022 +0000
+++ b/x11/xf86-input-vmmouse/Makefile Sun Oct 09 07:41:36 2022 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2022/04/10 08:53:19 nia Exp $
+# $NetBSD: Makefile,v 1.29 2022/10/09 07:41:36 wiz Exp $
-DISTNAME= xf86-input-vmmouse-13.1.0
-PKGREVISION= 2
+DISTNAME= xf86-input-vmmouse-13.2.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= https://xorg.freedesktop.org/
diff -r d6795f0c013d -r e65565d28143 x11/xf86-input-vmmouse/distinfo
--- a/x11/xf86-input-vmmouse/distinfo Sun Oct 09 07:38:04 2022 +0000
+++ b/x11/xf86-input-vmmouse/distinfo Sun Oct 09 07:41:36 2022 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:34:40 nia Exp $
+$NetBSD: distinfo,v 1.13 2022/10/09 07:41:36 wiz Exp $
-BLAKE2s (xf86-input-vmmouse-13.1.0.tar.bz2) = 8ce57f4d4d245e50e1932d5f988dd030aa206de429418394e9fce8961d33f051
-SHA512 (xf86-input-vmmouse-13.1.0.tar.bz2) = 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-Size (xf86-input-vmmouse-13.1.0.tar.bz2) = 319188 bytes
-SHA1 (patch-config.h.in) = ee6936aef0cbb1402c000eb9a8cf1539dfe5e8ef
-SHA1 (patch-configure) = 983efdbf9ede0943746b4b2c008b5d0f2fd4df81
-SHA1 (patch-tools_vmmouse__iopl.c) = e0527fee0d29485580b2cfe64d09e27a7792278e
+BLAKE2s (xf86-input-vmmouse-13.2.0.tar.xz) = 900e758f5fc0ef0e62a38d55beadd434973f7a3326776de537f98487d157480f
+SHA512 (xf86-input-vmmouse-13.2.0.tar.xz) = 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687
+Size (xf86-input-vmmouse-13.2.0.tar.xz) = 284684 bytes
diff -r d6795f0c013d -r e65565d28143 x11/xf86-input-vmmouse/patches/patch-config.h.in
--- a/x11/xf86-input-vmmouse/patches/patch-config.h.in Sun Oct 09 07:38:04 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2015/06/29 11:15:05 wiz Exp $
-
---- config.h.in.orig 2015-06-25 10:27:50.000000000 +0000
-+++ config.h.in
-@@ -102,6 +102,9 @@
- /* BSD AMD64 iopl */
- #undef USE_AMD64_IOPL
-
-+/* BSD X86_64 iopl */
-+#undef USE_X86_64_IOPL
-+
- /* BSD /dev/io */
- #undef USE_DEV_IO
-
diff -r d6795f0c013d -r e65565d28143 x11/xf86-input-vmmouse/patches/patch-configure
--- a/x11/xf86-input-vmmouse/patches/patch-configure Sun Oct 09 07:38:04 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2017/01/11 12:58:50 wiz Exp $
-
-DragonFly patches from DragonFly dports
-iopl patches for NetBSD
-
---- configure.orig 2015-06-25 10:27:50.000000000 +0000
-+++ configure
-@@ -18024,13 +18024,13 @@ done
- $as_echo "#define VMMOUSE_OS_GENERIC 1" >>confdefs.h
-
- ;;
-- *bsd*)
-+ *bsd*|*dragonfly*)
-
- $as_echo "#define VMMOUSE_OS_BSD 1" >>confdefs.h
-
- ;;
- solaris*)
-- if test "x$GCC" == "xyes"; then
-+ if test "x$GCC" = "xyes"; then
- CC="$save_solaris_cc -fms-extensions"
- fi
-
-@@ -18073,13 +18073,13 @@ case $host_cpu in
- ;;
- x86_64*|amd64*)
- case $host_os in
-- *freebsd*)
-+ *freebsd*|*dragonfly*)
- $as_echo "#define USE_DEV_IO 1" >>confdefs.h
- ;;
- *netbsd*)
--$as_echo "#define USE_I386_IOPL 1" >>confdefs.h
-+$as_echo "#define USE_X86_64_IOPL 1" >>confdefs.h
-
-- use_i386_iopl=yes ;;
-+ use_x86_64_iopl=yes ;;
- *openbsd*)
- $as_echo "#define USE_AMD64_IOPL 1" >>confdefs.h
-
-@@ -18188,6 +18188,56 @@ fi
-
- fi
-
-+if test x$use_x86_64_iopl = xyes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x86_64_iopl in -lx86_64" >&5
-+$as_echo_n "checking for x86_64_iopl in -lx86_64... " >&6; }
-+if ${ac_cv_lib_x86_64_x86_64_iopl+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lx86_64 $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char x86_64_iopl ();
-+int
-+main ()
-+{
-+return x86_64_iopl ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_x86_64_x86_64_iopl=yes
-+else
-+ ac_cv_lib_x86_64_x86_64_iopl=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_x86_64_x86_64_iopl" >&5
-+$as_echo "$ac_cv_lib_x86_64_x86_64_iopl" >&6; }
-+if test "x$ac_cv_lib_x86_64_x86_64_iopl" = xyes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBAMD64 1
-+_ACEOF
-+
-+ LIBS="-lx86_64 $LIBS"
-+
-+else
-+ as_fn_error $? "cannot find library for x86_64_iopl" "$LINENO" 5
-+fi
-+
-+fi
-+
-
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
diff -r d6795f0c013d -r e65565d28143 x11/xf86-input-vmmouse/patches/patch-tools_vmmouse__iopl.c
--- a/x11/xf86-input-vmmouse/patches/patch-tools_vmmouse__iopl.c Sun Oct 09 07:38:04 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-tools_vmmouse__iopl.c,v 1.1 2015/06/29 11:15:05 wiz Exp $
-
---- tools/vmmouse_iopl.c.orig 2015-04-09 06:04:46.000000000 +0000
-+++ tools/vmmouse_iopl.c
-@@ -44,8 +44,15 @@
-
- #if defined(VMMOUSE_OS_BSD)
- #include <sys/types.h>
--#ifdef USE_I386_IOPL
-+#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL) || defined(USE_X86_64_IOPL)
- #include <machine/sysarch.h>
-+#if defined(USE_I386_IOPL)
-+#define IOPL_NAME i386_iopl
-+#elif defined(USE_AMD64_IOPL)
-+#define IOPL_NAME amd64_iopl
-+#elif defined(USE_X86_64_IOPL)
-+#define IOPL_NAME x86_64_iopl
-+#endif
- /***************************************************************************/
- /* I/O Permissions section */
- /***************************************************************************/
-@@ -57,7 +64,7 @@ xf86EnableIO()
- if (ExtendedEnabled)
- return true;
-
-- if (i386_iopl(1) < 0)
-+ if (IOPL_NAME(1) < 0)
- return false;
-
- ExtendedEnabled = true;
-@@ -70,48 +77,13 @@ xf86DisableIO()
- if (!ExtendedEnabled)
- return;
-
-- i386_iopl(0);
-+ IOPL_NAME(0);
-
- ExtendedEnabled = false;
- return;
- }
-
--#endif /* USE_I386_IOPL */
--
--#ifdef USE_AMD64_IOPL
--#include <machine/sysarch.h>
--/***************************************************************************/
--/* I/O Permissions section */
--/***************************************************************************/
--
--static bool ExtendedEnabled = false;
--
--bool
--xf86EnableIO()
--{
-- if (ExtendedEnabled)
-- return true;
--
-- if (amd64_iopl(1) < 0)
-- return false;
--
-- ExtendedEnabled = true;
-- return true;
--}
--
--void
--xf86DisableIO()
--{
-- if (!ExtendedEnabled)
-- return;
--
-- if (amd64_iopl(0) == 0)
-- ExtendedEnabled = false;
--
-- return;
--}
--
--#endif /* USE_AMD64_IOPL */
-+#endif /* defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL) || defined(USE_X86_64_IOPL) */
-
- #ifdef USE_DEV_IO
- #include <sys/stat.h>
Home |
Main Index |
Thread Index |
Old Index