pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add (not working yet) SDL-hercules-hyperion
Module Name: pkgsrc-wip
Committed By: Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By: rhialto
Date: Fri Jan 31 22:25:39 2020 +0100
Changeset: 8950d35f793e874def78405b1945a8f7bc821438
Added Files:
sdl-hercules-hyperion/DESCR
sdl-hercules-hyperion/Makefile
sdl-hercules-hyperion/PLIST
sdl-hercules-hyperion/distinfo
sdl-hercules-hyperion/patches/patch-Makefile.am
sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
sdl-hercules-hyperion/patches/patch-configure.ac
sdl-hercules-hyperion/patches/patch-hercifc.c
sdl-hercules-hyperion/patches/patch-hifr.h
sdl-hercules-hyperion/patches/patch-hscutl.c
sdl-hercules-hyperion/patches/patch-htypes.h
sdl-hercules-hyperion/patches/patch-tuntap.c
sdl-hercules-hyperion/patches/patch-tuntap.h
Log Message:
Add (not working yet) SDL-hercules-hyperion
from https://github.com/SDL-Hercules-390/hyperion
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8950d35f793e874def78405b1945a8f7bc821438
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sdl-hercules-hyperion/DESCR | 8 +++++
sdl-hercules-hyperion/Makefile | 28 +++++++++++++++
sdl-hercules-hyperion/PLIST | 2 ++
sdl-hercules-hyperion/distinfo | 15 ++++++++
sdl-hercules-hyperion/patches/patch-Makefile.am | 40 ++++++++++++++++++++++
.../patches/patch-autoconf_hercules.m4 | 15 ++++++++
sdl-hercules-hyperion/patches/patch-configure.ac | 15 ++++++++
sdl-hercules-hyperion/patches/patch-hercifc.c | 15 ++++++++
sdl-hercules-hyperion/patches/patch-hifr.h | 15 ++++++++
sdl-hercules-hyperion/patches/patch-hscutl.c | 16 +++++++++
sdl-hercules-hyperion/patches/patch-htypes.h | 16 +++++++++
sdl-hercules-hyperion/patches/patch-tuntap.c | 15 ++++++++
sdl-hercules-hyperion/patches/patch-tuntap.h | 15 ++++++++
13 files changed, 215 insertions(+)
diffs:
diff --git a/sdl-hercules-hyperion/DESCR b/sdl-hercules-hyperion/DESCR
new file mode 100644
index 0000000000..cb31512af7
--- /dev/null
+++ b/sdl-hercules-hyperion/DESCR
@@ -0,0 +1,8 @@
+THIS DOES NOT WORK!
+
+This is supposed to be an activiely developed version of emulators/hercules.
+Unfortunately, the distribution contains static library binaries,
+with no corresponding source.
+
+Without the source, you can't compile it on your favorite CPU or operating
+system.
diff --git a/sdl-hercules-hyperion/Makefile b/sdl-hercules-hyperion/Makefile
new file mode 100644
index 0000000000..e91aa45c6b
--- /dev/null
+++ b/sdl-hercules-hyperion/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD$
+
+PKGNAME= sdl-hercules-hyperion-4.2.1
+DISTNAME= Release_${PKGVERSION_NOREV}
+CATEGORIES= emulators
+MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
+EXTRACT_USING= bsdtar
+
+MAINTAINER= rhialto%NetBSD.org@localhost
+HOMEPAGE= https://github.com/SDL-Hercules-390/hyperion
+COMMENT= The SoftDevLabs version of Hercules 4.x (Hyperion)
+LICENSE= qpl-v1.0
+
+GITHUB_PROJECT= hyperion
+GITHUB_TAG= Release_${PKGVERSION_NOREV}
+
+GNU_CONFIGURE= yes
+USE_TOOLS+= autoconf automake flex gawk grep gm4 gmake perl gsed
+USE_LANGUAGES+= c
+
+
+CONFIGURE_ARGS+= --disable-ipv6 # configure can't find header
+
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sdl-hercules-hyperion/PLIST b/sdl-hercules-hyperion/PLIST
new file mode 100644
index 0000000000..b96b40e3fc
--- /dev/null
+++ b/sdl-hercules-hyperion/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+@comment Package does not build yet
diff --git a/sdl-hercules-hyperion/distinfo b/sdl-hercules-hyperion/distinfo
new file mode 100644
index 0000000000..2cb66e4795
--- /dev/null
+++ b/sdl-hercules-hyperion/distinfo
@@ -0,0 +1,15 @@
+$NetBSD$
+
+SHA1 (Release_4.2.1.tar.gz) = ca2f9c802c05c4ddd528718c2a3b4df01ae09564
+RMD160 (Release_4.2.1.tar.gz) = cc8fd7e5deb2b2a857215172c13b237f1525858b
+SHA512 (Release_4.2.1.tar.gz) = 8d8e94136b3ffa57fc03f687c3b8662ccffb150a29904e911d2383eadd09ae732e73c1712e00bf9a8350fbdd31936f10c498e64574c4bd4316e82c1fb535ca68
+Size (Release_4.2.1.tar.gz) = 11124925 bytes
+SHA1 (patch-Makefile.am) = 01c1b8865febfd3451b2adbcc84ab7f91fc64964
+SHA1 (patch-autoconf_hercules.m4) = 2ea0beaa0a0470050f0c41befcaebd9f73dad4d5
+SHA1 (patch-configure.ac) = 731a24d749f49c1c0ee1d70b05b09e3e1ee5dec2
+SHA1 (patch-hercifc.c) = 5661ca325cb3575726a44ecadbaeb951fcf2d0fd
+SHA1 (patch-hifr.h) = d364bbd32143cf137aed84eb79f5af9f62f8210b
+SHA1 (patch-hscutl.c) = 72ff77bff284e63bc42e124b56051fe735f74de6
+SHA1 (patch-htypes.h) = 7e057ae370b266758176fbe13964581cac5004f0
+SHA1 (patch-tuntap.c) = ea3ca480613781e9dc09479d32e6d1138cc396aa
+SHA1 (patch-tuntap.h) = 24946aab519beb6185800801f2bb38dccfdfef94
diff --git a/sdl-hercules-hyperion/patches/patch-Makefile.am b/sdl-hercules-hyperion/patches/patch-Makefile.am
new file mode 100644
index 0000000000..62164824ac
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-Makefile.am
@@ -0,0 +1,40 @@
+$NetBSD$
+
+* Fix build. Use devel/libltdl instead of internal libltdl.
+
+--- Makefile.am.orig 2019-09-10 18:06:20.000000000 +0000
++++ Makefile.am
+@@ -11,7 +11,7 @@ extpkg_headers = @EXTPKG_HEADERS@
+ extpkg_ldadd = @EXTPKG_LDADD@
+ hqa_inc = @HQA_INC@
+ lns = @LN_S@
+-ldadd = @LIBS@
++ldadd = @LIBS@ -lltdl
+
+ #------------------------------------------------------------------------------
+
+@@ -142,7 +142,7 @@ dyndev_SRC = \
+
+ XSTATIC =
+ DYNSRC =
+-LTDL = ltdl.c
++LTDL =
+
+ DYNMOD_LD_FLAGS = \
+ -module \
+@@ -500,7 +500,6 @@ libherc_la_SOURCES = \
+ $(DYNSRC)
+
+ EXTRA_libherc_la_SOURCES = \
+- ltdl.c \
+ memrchr.c \
+ $(dynamic_SRC) \
+ $(dyndev_SRC) \
+@@ -939,7 +938,6 @@ noinst_HEADERS = \
+ inline.h \
+ linklist.h \
+ logger.h \
+- ltdl.h \
+ machdep.h \
+ memrchr.h \
+ mpc.h \
diff --git a/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4 b/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
new file mode 100644
index 0000000000..f7fde8c636
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-autoconf_hercules.m4
@@ -0,0 +1,15 @@
+$NetBSD$
+
+test == is not portable.
+
+--- autoconf/hercules.m4.orig 2019-09-10 18:06:20.000000000 +0000
++++ autoconf/hercules.m4
+@@ -187,7 +187,7 @@ AC_DEFUN( [HC_GET_C11_LOCK_FREE_VALUE],
+ [
+ c11_lock_free_name="$1"
+
+- if test "x$c11_lock_free_name" == "x"; then
++ if test "x$c11_lock_free_name" = "x"; then
+ # PROGRAMMING NOTE: note special m4 escape syntax used in the below
+ # message. Without it, our function name is (infinitely and recursively?)
+ # expanded to our actual (as-yet not yet fully defined!) macro VALUE(!),
diff --git a/sdl-hercules-hyperion/patches/patch-configure.ac b/sdl-hercules-hyperion/patches/patch-configure.ac
new file mode 100644
index 0000000000..edb5ea1366
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+test == is not portable.
+
+--- configure.ac.orig 2019-09-10 18:06:20.000000000 +0000
++++ configure.ac
+@@ -1202,7 +1202,7 @@ AC_CHECK_SIZEOF(size_t)
+ AC_CHECK_SIZEOF(int *)
+ AC_CHECK_SIZEOF(off_t)
+
+-if test "$hc_cv_have_pthread_h" == "yes"; then
++if test "$hc_cv_have_pthread_h" = "yes"; then
+ AC_CHECK_SIZEOF(pthread_t)
+ fi
+
diff --git a/sdl-hercules-hyperion/patches/patch-hercifc.c b/sdl-hercules-hyperion/patches/patch-hercifc.c
new file mode 100644
index 0000000000..0c276c3ae5
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-hercifc.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD doesn't have TUNSETIFF.
+
+--- hercifc.c.orig 2019-09-10 18:06:20.000000000 +0000
++++ hercifc.c
+@@ -115,7 +115,7 @@ int main( int argc, char **argv )
+
+ switch( ctlreq.iCtlOp )
+ {
+-#if !defined(__APPLE__) && !defined(__FreeBSD__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
+ case TUNSETIFF:
+ pOp = "TUNSETIFF";
+ pArg = &ctlreq.iru.hifr.ifreq;
diff --git a/sdl-hercules-hyperion/patches/patch-hifr.h b/sdl-hercules-hyperion/patches/patch-hifr.h
new file mode 100644
index 0000000000..7760fca53a
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-hifr.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD is like FreeBSD here.
+
+--- hifr.h.orig 2019-09-10 18:06:20.000000000 +0000
++++ hifr.h
+@@ -110,7 +110,7 @@ struct hifr
+ };
+ typedef struct hifr hifr;
+
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #define hifr_name ifreq.ifr_name
+ #else
+ #define hifr_name ifreq.ifr_ifrn.ifrn_name
diff --git a/sdl-hercules-hyperion/patches/patch-hscutl.c b/sdl-hercules-hyperion/patches/patch-hscutl.c
new file mode 100644
index 0000000000..9f807c797d
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-hscutl.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Wrong number of arguments to pthread_setname_np:
+pthread_setname_np(pthread_t thread, const char *name, void *arg);
+
+--- hscutl.c.orig 2019-09-10 18:06:20.000000000 +0000
++++ hscutl.c
+@@ -1660,7 +1660,7 @@ DLL_EXPORT int nix_set_thread_name( pthr
+ return EINVAL;
+ rc = pthread_setname_np( threadname );
+ #else
+- rc = pthread_setname_np( tid, threadname );
++ rc = pthread_setname_np( tid, threadname, 0 );
+ #endif
+
+ /* Ignore any error; it either worked or it didn't */
diff --git a/sdl-hercules-hyperion/patches/patch-htypes.h b/sdl-hercules-hyperion/patches/patch-htypes.h
new file mode 100644
index 0000000000..c38c458de3
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-htypes.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Can't re-#define int32_t; this is a reserved name.
+
+--- htypes.h.orig 2019-09-10 18:06:20.000000000 +0000
++++ htypes.h
+@@ -48,7 +48,9 @@
+
+ #endif
+
++#ifndef int32_t
+ #define int32_t int32_t /* (used by extpkgs) */
++#endif
+
+ #ifndef HAVE_U_INT8_T
+ typedef uint8_t u_int8_t;
diff --git a/sdl-hercules-hyperion/patches/patch-tuntap.c b/sdl-hercules-hyperion/patches/patch-tuntap.c
new file mode 100644
index 0000000000..4ce41af495
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-tuntap.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD is totally different. Patch the whole file out for now.
+
+--- tuntap.c.orig 2019-09-10 18:06:20.000000000 +0000
++++ tuntap.c
+@@ -30,7 +30,7 @@
+ #include "hstdinc.h"
+
+ /* jbs 1/19/2008 added ifdef on __SOLARIS__ */
+-#if !defined(__SOLARIS__)
++#if !defined(__SOLARIS__) && !defined(__NetBSD__)
+
+ #include "hercules.h"
+ #include "tuntap.h"
diff --git a/sdl-hercules-hyperion/patches/patch-tuntap.h b/sdl-hercules-hyperion/patches/patch-tuntap.h
new file mode 100644
index 0000000000..475cda0f5c
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-tuntap.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD also uses "/dev/tun".
+
+--- tuntap.h.orig 2019-09-10 18:06:20.000000000 +0000
++++ tuntap.h
+@@ -25,7 +25,7 @@
+ // TunTap ioctl codes and Standard and TUNSETIFF ifr interface flags
+ // ====================================================================
+
+-#if defined(__APPLE__) || defined(__FreeBSD__)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+ #define HERCTUN_DEV "/dev/tun" // Default TUN/TAP char dev
+ #else
+ #define HERCTUN_DEV "/dev/net/tun" // Default TUN/TAP char dev
Home |
Main Index |
Thread Index |
Old Index