pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/vice various improvements:
details: https://anonhg.NetBSD.org/pkgsrc/rev/f07ee919a436
branches: trunk
changeset: 478569:f07ee919a436
user: dillo <dillo%pkgsrc.org@localhost>
date: Mon Jul 26 17:22:40 2004 +0000
description:
various improvements:
- enable fullscreen support
- enable PNG screenshots
- only use esound if USE_ESOUND is yes
- add USB joystick support (okayed by kristerw)
PKGREVISION++
diffstat:
emulators/vice/Makefile | 9 +-
emulators/vice/distinfo | 12 +-
emulators/vice/patches/patch-ba | 30 +++
emulators/vice/patches/patch-bb | 12 +
emulators/vice/patches/patch-bc | 34 +++
emulators/vice/patches/patch-bd | 384 ++++++++++++++++++++++++++++++++++++++++
emulators/vice/patches/patch-be | 19 +
emulators/vice/patches/patch-bf | 13 +
emulators/vice/patches/patch-bg | 34 +++
emulators/vice/patches/patch-bh | 21 ++
emulators/vice/patches/patch-bi | 310 ++++++++++++++++++++++++++++++++
emulators/vice/patches/patch-bj | 55 +++++
12 files changed, 930 insertions(+), 3 deletions(-)
diffs (truncated from 1016 to 300 lines):
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/Makefile
--- a/emulators/vice/Makefile Mon Jul 26 17:06:29 2004 +0000
+++ b/emulators/vice/Makefile Mon Jul 26 17:22:40 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2004/07/16 22:59:11 kristerw Exp $
+# $NetBSD: Makefile,v 1.46 2004/07/26 17:22:40 dillo Exp $
#
DISTNAME= vice-1.14
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/
@@ -27,10 +27,12 @@
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_GCC_SHLIB= YES
+CONFIGURE_ARGS+= --enable-fullscreen
INFO_FILES= vice.info
BUILD_DEFS+= VICE_USE_FFMPEG
+BUILD_DEFS+= USE_ESOUND
.include "../../mk/bsd.prefs.mk"
@@ -53,10 +55,13 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice
${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice
+.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
.include "../../audio/esound/buildlink3.mk"
+.endif
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss])
.include "../../multimedia/ffmpeg/buildlink3.mk"
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/distinfo
--- a/emulators/vice/distinfo Mon Jul 26 17:06:29 2004 +0000
+++ b/emulators/vice/distinfo Mon Jul 26 17:22:40 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2004/07/16 22:59:11 kristerw Exp $
+$NetBSD: distinfo,v 1.14 2004/07/26 17:22:40 dillo Exp $
SHA1 (vice-1.14.tar.gz) = 5f2c458533db0b41dd55732e9d9434275904ab29
Size (vice-1.14.tar.gz) = 3794698 bytes
@@ -6,3 +6,13 @@
SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
SHA1 (patch-ac) = bb648b8dc668a12540eab9f1be6374aab8cda35a
SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
+SHA1 (patch-ba) = 8f94dd31ef10ae2acc82ed721d71cc9eb7ff13d8
+SHA1 (patch-bb) = 15b84e9f7d20b8518ab77b8ae0765227a1ad7a5d
+SHA1 (patch-bc) = d34ddf4723b45a844fb6ab96b2924e117934f8f9
+SHA1 (patch-bd) = b2f4dca0a259cdb3ffed5ea86c955f47508cdeff
+SHA1 (patch-be) = ec8308214c51a50aa948cf064865cd8cd03ee7e3
+SHA1 (patch-bf) = e19994029b10c2403b53a575bbfb7523c2966ed2
+SHA1 (patch-bg) = 3a396e3cbeddd2c99beebd26bca30e233e89e009
+SHA1 (patch-bh) = 97396118e6abecd9dd464cdae7b918ea025f5f0f
+SHA1 (patch-bi) = 4d94fff17db834031df3b39148dcefac6f7bf968
+SHA1 (patch-bj) = b279df0c6d0700f42fe6cbd1811170171152bf49
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-ba Mon Jul 26 17:22:40 2004 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ba,v 1.1 2004/07/26 17:22:40 dillo Exp $
+
+--- configure.in.orig Sun Jan 25 16:42:36 2004
++++ configure.in
+@@ -531,8 +531,24 @@ if test x"$host_vendor" != "xgo32" -a x"
+ AC_DEFINE(BSD_JOYSTICK,,
+ [Enable support for BSD style joysticks.])
+ JOY_OBJS='$(ARCHDIR)/joystick.o' ], )
+- AC_SUBST(JOY_OBJS)
+
++ dnl NetBSD/FreeBSD USB joystick support
++ usbhid_header=no
++ AC_CHECK_LIB(usbhid, hid_get_report_desc,
++ [AC_CHECK_HEADER(usbhid.h,
++ [AC_DEFINE(HAVE_USBHID_H,1,
++ [Define to 1 if you have the <usbhid.h> header file.])
++ usb_header=yes],
++ [AC_CHECK_HEADER(libusbhid.h,
++ [AC_DEFINE(HAVE_LIBUSBHID_H,1,
++ [Define to 1 if you have the <libusbhid.h> header file.])],
++ usbhid_header=no)])
++ if test x"$usb_header" = "xyes" ; then
++ AC_DEFINE(HAS_USB_JOYSTICK,,[Enable emulation for USB joysticks.])
++ LIBS="$LIBS -lusbhid"
++ fi])
++
++ AC_SUBST(JOY_OBJS)
+ fi
+
+ dnl Check for math library
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-bb Mon Jul 26 17:22:40 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-bb,v 1.1 2004/07/26 17:22:40 dillo Exp $
+
+--- src/arch/unix/Makefile.am.orig Sun Nov 23 16:09:36 2003
++++ src/arch/unix/Makefile.am
+@@ -36,6 +36,7 @@ libarch_a_SOURCES = \
+ icon.h \
+ joy.c \
+ joy.h \
++ joy_usb.c \
+ kbd.h \
+ mousedrv.c \
+ mousedrv.h \
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-bc Mon Jul 26 17:22:40 2004 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-bc,v 1.1 2004/07/26 17:22:40 dillo Exp $
+
+--- src/config.h.in.orig Fri May 14 11:30:37 2004
++++ src/config.h.in
+@@ -30,6 +30,9 @@
+ /* Do we have UnlockResource()? */
+ #undef HAS_UNLOCKRESOURCE
+
++/* Enable emulation for USB joysticks. */
++#undef HAS_USB_JOYSTICK
++
+ /* Define to 1 if you have the <allegro.h> header file. */
+ #undef HAVE_ALLEGRO_H
+
+@@ -134,6 +137,9 @@
+ /* Define to 1 if you have the `UMSobj' library (-lUMSobj). */
+ #undef HAVE_LIBUMSOBJ
+
++/* Define to 1 if you have the <libusbhid.h> header file. */
++#undef HAVE_LIBUSBHID_H
++
+ /* Is libXpm available? */
+ #undef HAVE_LIBXPM
+
+@@ -256,6 +262,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
++/* Define to 1 if you have the <usbhid.h> header file. */
++#undef HAVE_USBHID_H
++
+ /* Define to 1 if you have the `usleep' function. */
+ #undef HAVE_USLEEP
+
diff -r badf08d9e05e -r f07ee919a436 emulators/vice/patches/patch-bd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-bd Mon Jul 26 17:22:40 2004 +0000
@@ -0,0 +1,384 @@
+$NetBSD: patch-bd,v 1.1 2004/07/26 17:22:40 dillo Exp $
+
+--- configure.orig Fri May 14 11:30:32 2004
++++ configure
+@@ -9127,6 +9793,379 @@ fi
+
+
+
++ usbhid_header=no
++ echo "$as_me:$LINENO: checking for hid_get_report_desc in -lusbhid" >&5
++echo $ECHO_N "checking for hid_get_report_desc in -lusbhid... $ECHO_C" >&6
++if test "${ac_cv_lib_usbhid_hid_get_report_desc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lusbhid $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char hid_get_report_desc ();
++int
++main ()
++{
++hid_get_report_desc ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_lib_usbhid_hid_get_report_desc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_usbhid_hid_get_report_desc=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_usbhid_hid_get_report_desc" >&5
++echo "${ECHO_T}$ac_cv_lib_usbhid_hid_get_report_desc" >&6
++if test $ac_cv_lib_usbhid_hid_get_report_desc = yes; then
++ if test "${ac_cv_header_usbhid_h+set}" = set; then
++ echo "$as_me:$LINENO: checking for usbhid.h" >&5
++echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6
++if test "${ac_cv_header_usbhid_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5
++echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6
++else
++ # Is the header compilable?
++echo "$as_me:$LINENO: checking usbhid.h usability" >&5
++echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <usbhid.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking usbhid.h presence" >&5
++echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <usbhid.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
Home |
Main Index |
Thread Index |
Old Index