[pkgsrc/trunk]: pkgsrc/devel/SDL Support for DragonFlyBSD, based on patches f...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/SDL Support for DragonFlyBSD, based on patches f...
From: wiz <wiz%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:49:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e98709e96dbd
branches:  trunk
changeset: 494194:e98709e96dbd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 20 20:08:40 2005 +0000

description:
Support for DragonFlyBSD, based on patches from Joerg Sonnenberger.

diffstat:

 devel/SDL/distinfo         |  12 +++++--
 devel/SDL/patches/patch-aa |  39 ++++++++++++++++++++-------
 devel/SDL/patches/patch-aj |  30 +++++++++++++++-----
 devel/SDL/patches/patch-am |  64 ++++++++++++++++++++++++++++-----------------
 devel/SDL/patches/patch-da |  13 +++++++++
 devel/SDL/patches/patch-db |  13 +++++++++
 devel/SDL/patches/patch-dc |  40 ++++++++++++++++++++++++++++
 devel/SDL/patches/patch-dd |  13 +++++++++
 8 files changed, 176 insertions(+), 48 deletions(-)

diffs (truncated from 541 to 300 lines):

diff -r c8afe347c6b1 -r e98709e96dbd devel/SDL/distinfo
--- a/devel/SDL/distinfo        Fri May 20 19:48:34 2005 +0000
+++ b/devel/SDL/distinfo        Fri May 20 20:08:40 2005 +0000
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.38 2005/02/23 22:24:08 agc Exp $
+$NetBSD: distinfo,v 1.39 2005/05/20 20:08:40 wiz Exp $
 
 SHA1 (SDL-1.2.8.tar.gz) = 26f2104a60a28914b809d3cb77d5790bfdfd024c
 RMD160 (SDL-1.2.8.tar.gz) = 91aa02f6b52792b3ec7f5478bcaebda1542980dc
 Size (SDL-1.2.8.tar.gz) = 2602449 bytes
-SHA1 (patch-aa) = d96902d3de2eb1f0c4edaa8b174f09ae1a654625
+SHA1 (patch-aa) = 0853dfa9d64d0848de0d084541b6ffd38ffdedad
 SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
 SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
 SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = bf5173f8a510cfb86a5d48b7afbbaee6c501f3a0
+SHA1 (patch-aj) = f857e5dba94ff6d3893f6218cbc0c9e011f02cf7
 SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = 8ed1ce2ef11210e0fe865ba8f1b315853900f2e4
+SHA1 (patch-am) = 54ddcc39e8e23bbff09ffc0d56b783ec7404eea3
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
 SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
 SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
@@ -19,3 +19,7 @@
 SHA1 (patch-bd) = 3d8b20cfe774280d1c8e96405ae26bc23444ee8d
 SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
 SHA1 (patch-bf) = 0df8784f0e03ae3b1e63a06c2fc8255d3fdaf39f
+SHA1 (patch-da) = 9a38b1e2fcc0eb4c499c52402e70083f30e7ec96
+SHA1 (patch-db) = 4543d1fe47fa068bcda83eb53d495e0c6085b371
+SHA1 (patch-dc) = 7d0bc4a78ad1a589cb797094e39e3099e2414e99
+SHA1 (patch-dd) = a80c43d5cab4cc83c98dae7449219f68e1dbea88
diff -r c8afe347c6b1 -r e98709e96dbd devel/SDL/patches/patch-aa
--- a/devel/SDL/patches/patch-aa        Fri May 20 19:48:34 2005 +0000
+++ b/devel/SDL/patches/patch-aa        Fri May 20 20:08:40 2005 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-aa,v 1.10 2005/05/20 20:08:40 wiz Exp $
 
---- src/joystick/bsd/SDL_sysjoystick.c.orig    2004-12-13 07:54:32.000000000 +0000
+--- src/joystick/bsd/SDL_sysjoystick.c.orig    2004-12-13 08:54:32.000000000 +0100
 +++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -60,7 +60,7 @@ static char rcsid =
+@@ -55,12 +55,14 @@ static char rcsid =
+ #include <libusbhid.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#ifdef __DragonFly__
++#include <sys/joystick.h>
++#elif defined(__FreeBSD__)
+ #include <osreldate.h>
  #include <sys/joystick.h>
  #endif
  
@@ -11,7 +19,7 @@
  #include <machine/joystick.h>
  #endif
  
-@@ -239,6 +239,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -239,6 +241,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
        struct hid_data *hdata;
        struct report *rep;
        int fd;
@@ -19,7 +27,7 @@
  
        fd = open(path, O_RDONLY);
        if (fd == -1) {
-@@ -303,6 +304,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -303,6 +306,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
        joy->nbuttons = 0;
        joy->nhats = 0;
        joy->nballs = 0;
@@ -28,7 +36,7 @@
  
        while (hid_get_item(hdata, &hitem) > 0) {
                char *sp;
-@@ -329,8 +332,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -329,8 +334,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
                            unsigned usage = HID_USAGE(hitem.usage);
                            int joyaxe = usage_to_joyaxe(usage);
                            if (joyaxe >= 0) {
@@ -38,7 +46,7 @@
                            } else if (usage == HUG_HAT_SWITCH) {
                                joy->nhats++;
                            }
-@@ -348,6 +350,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -348,6 +352,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
                }
        }
        hid_end_parse(hdata);
@@ -48,16 +56,25 @@
  
  usbend:
        /* The poll blocks the event thread. */
-@@ -370,7 +375,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -370,7 +377,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
        int nbutton, naxe = -1;
        Sint32 v;
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__) || defined(__DragonFly__)
        struct joystick gameport;
        static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
   
-@@ -457,7 +462,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -419,7 +426,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+               }
+               return;
+       }
+-#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
++#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)*/
+       
+       rep = &joy->hwdata->inreport;
+ 
+@@ -457,7 +464,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
                            } else if (usage == HUG_HAT_SWITCH) {
                                v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
                                                         &hitem);
@@ -67,7 +84,7 @@
                            }
                            break;
                        }
-@@ -530,9 +536,9 @@ report_alloc(struct report *r, struct re
+@@ -530,9 +538,9 @@ report_alloc(struct report *r, struct re
  #endif
  #else
  # ifdef USBHID_NEW
diff -r c8afe347c6b1 -r e98709e96dbd devel/SDL/patches/patch-aj
--- a/devel/SDL/patches/patch-aj        Fri May 20 19:48:34 2005 +0000
+++ b/devel/SDL/patches/patch-aj        Fri May 20 20:08:40 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $
 
---- configure.in.orig  2004-12-13 09:02:08.000000000 +0000
+--- configure.in.orig  2004-12-13 10:02:08.000000000 +0100
 +++ configure.in
 @@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
  
@@ -88,9 +88,14 @@
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1248,8 +1251,8 @@ CheckPTHREAD()
+@@ -1247,9 +1250,13 @@ CheckPTHREAD()
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
++        *-*-dragonfly*)
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-pthread"
++            ;;
          *-*-netbsd*)
 -            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
@@ -99,7 +104,7 @@
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -1724,29 +1727,31 @@ CheckUSBHID()
+@@ -1724,29 +1731,31 @@ CheckUSBHID()
          have_libusbhid=no
          have_libusb=no
          AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -140,7 +145,7 @@
          fi
  
          AC_MSG_CHECKING(for usbhid)
-@@ -1835,6 +1840,26 @@ CheckUSBHID()
+@@ -1835,6 +1844,26 @@ CheckUSBHID()
      fi
  }
  
@@ -167,7 +172,16 @@
  dnl Check for altivec instruction support using gas syntax
  CheckAltivec()
  {
-@@ -2043,16 +2068,18 @@ case "$target" in
+@@ -1992,7 +2021,7 @@ case "$target" in
+             COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
+         fi
+         ;;
+-    *-*-freebsd*)
++    *-*-freebsd* | *-*-dragonfly*)
+         ARCH=freebsd
+         CheckDummyVideo
+         CheckDiskAudio
+@@ -2043,16 +2072,18 @@ case "$target" in
          CheckESD
          CheckNAS
          CheckX11
@@ -189,7 +203,7 @@
          fi
          # Set up files for the cdrom library
          if test x$enable_cdrom = xyes; then
-@@ -2061,9 +2088,6 @@ case "$target" in
+@@ -2061,9 +2092,6 @@ case "$target" in
          fi
          # Set up files for the thread library
          if test x$enable_threads = xyes; then
@@ -199,7 +213,7 @@
              CopyUnixThreadSource
          fi
          # Set up files for the timer library
-@@ -2724,7 +2748,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
+@@ -2724,7 +2752,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
  
  # Set runtime shared library paths as needed
  
diff -r c8afe347c6b1 -r e98709e96dbd devel/SDL/patches/patch-am
--- a/devel/SDL/patches/patch-am        Fri May 20 19:48:34 2005 +0000
+++ b/devel/SDL/patches/patch-am        Fri May 20 20:08:40 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
+$NetBSD: patch-am,v 1.16 2005/05/20 20:08:40 wiz Exp $
 
---- configure.orig     2004-12-13 09:04:51.000000000 +0000
+--- configure.orig     2004-12-13 10:04:51.000000000 +0100
 +++ configure
 @@ -463,7 +463,7 @@ ac_includes_default="\
  # include <unistd.h>
@@ -227,9 +227,14 @@
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26807,8 +26805,8 @@ fi;
+@@ -26806,9 +26804,13 @@ fi;
+             pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
++      *-*-dragonfly*)
++            pthread_cflags="-D_REENTRANT"
++            pthread_lib="-pthread"
++            ;;
          *-*-netbsd*)
 -            pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
 -            pthread_lib="-L/usr/pkg/lib -lpthread -lsem"
@@ -238,7 +243,7 @@
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -28637,93 +28635,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+@@ -28637,93 +28639,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -340,7 +345,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28731,7 +28657,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28731,7 +28661,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -349,7 +354,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28767,15 +28693,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28767,15 +28697,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
@@ -368,7 +373,7 @@
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -28809,25 +28735,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+@@ -28809,25 +28739,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    yes:no: )
@@ -410,7 +415,7 @@
      (
        cat <<\_ASBOX
  ## ------------------------------------------ ##
-@@ -28838,34 +28764,34 @@ _ASBOX
+@@ -28838,34 +28768,34 @@ _ASBOX
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -461,7 +466,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28873,7 +28799,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -28873,7 +28803,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -470,7 +475,7 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -28909,15 +28835,15 @@ echo "$as_me:$LINENO: result: $ac_header
+@@ -28909,15 +28839,15 @@ echo "$as_me:$LINENO: result: $ac_header
  echo "${ECHO_T}$ac_header_compiler" >&6
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/libtool-base PKGREVISION bump missed in previous.
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/speex Update to 1.0.5:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/libtool-base PKGREVISION bump missed in previous.
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/speex Update to 1.0.5:
Indexes:
Home | Main Index | Thread Index | Old Index