pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/SDL Remove some chunks that should not be necess...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1bde30817ad3
branches:  trunk
changeset: 507731:1bde30817ad3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Feb 07 18:15:50 2006 +0000

description:
Remove some chunks that should not be necessary any longer.

diffstat:

 devel/SDL/distinfo         |   10 +-
 devel/SDL/patches/patch-aj |   27 +------
 devel/SDL/patches/patch-al |   26 ++----
 devel/SDL/patches/patch-am |  184 +++++++++-----------------------------------
 devel/SDL/patches/patch-as |    6 +-
 5 files changed, 55 insertions(+), 198 deletions(-)

diffs (truncated from 576 to 300 lines):

diff -r b23372c9f253 -r 1bde30817ad3 devel/SDL/distinfo
--- a/devel/SDL/distinfo        Tue Feb 07 18:00:41 2006 +0000
+++ b/devel/SDL/distinfo        Tue Feb 07 18:15:50 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2005/09/07 10:15:39 adam Exp $
+$NetBSD: distinfo,v 1.42 2006/02/07 18:15:50 wiz Exp $
 
 SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
 RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
@@ -6,11 +6,11 @@
 SHA1 (patch-aa) = f41d0de165d41826a6de2fdf9521d4f41f97221a
 SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
 SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
-SHA1 (patch-aj) = 2f74ff477b743875e522ed752e2190a1c068e6b3
-SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = 957913466281b3ac3bba9dfbd7ba4faa09190dc1
+SHA1 (patch-aj) = 53dad2397355cb0282e449f794f84f5b4a0c3f3d
+SHA1 (patch-al) = a427d5b5a4e18a37d241142df575a71db2483a1e
+SHA1 (patch-am) = a4732f0563fe9bcc3c5329cf794ddf4a717bd5e4
 SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
+SHA1 (patch-as) = c099a77a9643621322fea1d5cf079abcab80a071
 SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
 SHA1 (patch-bb) = ebf35acf99240be873c64fcac07570e61f50b83e
 SHA1 (patch-bc) = f1eb12c2f9049af6a65bba9fe215ef3dc165fd83
diff -r b23372c9f253 -r 1bde30817ad3 devel/SDL/patches/patch-aj
--- a/devel/SDL/patches/patch-aj        Tue Feb 07 18:00:41 2006 +0000
+++ b/devel/SDL/patches/patch-aj        Tue Feb 07 18:15:50 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.23 2005/09/07 10:15:39 adam Exp $
+$NetBSD: patch-aj,v 1.24 2006/02/07 18:15:50 wiz Exp $
 
 --- configure.in.orig  2005-08-28 06:31:18.000000000 +0000
 +++ configure.in
@@ -45,31 +45,6 @@
                    ;;
              esac
              AC_SUBST(NASMFLAGS)
-@@ -985,18 +987,18 @@ CheckAAlib()
- [  --enable-video-aalib    use AAlib video driver [default=no]],
-                   , enable_video_aalib=no)
-     if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
-+        AC_PATH_PROG(AALIB_CONFIG, aalib-config)
-         AC_MSG_CHECKING(for AAlib support)
-+        if test x$AALIB_CONFIG = x; then
-         video_aalib=no
--        AC_TRY_COMPILE([
--         #include <aalib.h>
--        ],[
--        ],[
-+      else
-+            AALIB_LIBS=`$AALIB_CONFIG --libs`
-         video_aalib=yes
--        ])
-+        fi
-         AC_MSG_RESULT($video_aalib)
-         if test x$video_aalib = xyes; then
-             CFLAGS="$CFLAGS -DENABLE_AALIB"
--            SYSTEM_LIBS="$SYSTEM_LIBS -laa"
-+            SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS"
- 
-             VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
-             VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
 @@ -1202,12 +1204,13 @@ CheckPTH()
  [  --enable-pth            use GNU pth library for multi-threading [default=yes]],
                    , enable_pth=yes)
diff -r b23372c9f253 -r 1bde30817ad3 devel/SDL/patches/patch-al
--- a/devel/SDL/patches/patch-al        Tue Feb 07 18:00:41 2006 +0000
+++ b/devel/SDL/patches/patch-al        Tue Feb 07 18:15:50 2006 +0000
@@ -1,16 +1,8 @@
-$NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $
+$NetBSD: patch-al,v 1.7 2006/02/07 18:15:50 wiz Exp $
 
---- src/audio/openbsd/SDL_openbsdaudio.c.orig  2004-02-18 18:21:59.000000000 +0100
+--- src/audio/openbsd/SDL_openbsdaudio.c.orig  2004-01-04 17:49:15.000000000 +0100
 +++ src/audio/openbsd/SDL_openbsdaudio.c
-@@ -37,6 +37,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/audioio.h>
-+#include <pthread.h>
- 
- #include "SDL_audio.h"
- #include "SDL_error.h"
-@@ -46,8 +47,12 @@
+@@ -46,8 +46,12 @@
  #include "SDL_audiodev_c.h"
  #include "SDL_openbsdaudio.h"
  
@@ -24,7 +16,7 @@
  
  /* Open the audio device for playback, and don't block if busy */
  /* #define USE_BLOCKING_WRITES */
-@@ -132,7 +137,11 @@
+@@ -132,7 +136,11 @@ static SDL_AudioDevice
  }
  
  AudioBootStrap OPENBSD_AUDIO_bootstrap = {
@@ -36,7 +28,7 @@
        Audio_Available, Audio_CreateDevice
  };
  
-@@ -140,6 +149,7 @@
+@@ -140,6 +148,7 @@ AudioBootStrap OPENBSD_AUDIO_bootstrap =
  static void
  OBSD_WaitAudio(_THIS)
  {
@@ -44,7 +36,7 @@
        /* Check to see if the thread-parent process is still alive */
        { static int cnt = 0;
                /* Note that this only works with thread implementations 
-@@ -151,6 +161,7 @@
+@@ -151,6 +160,7 @@ OBSD_WaitAudio(_THIS)
                        }
                }
        }
@@ -52,7 +44,7 @@
  
  #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */
        /* See if we need to use timed audio synchronization */
-@@ -262,20 +273,20 @@
+@@ -262,20 +272,20 @@ OBSD_Status(_THIS)
        return;
      }
  
@@ -87,7 +79,7 @@
  ",
      info.play.buffer_size,
      info.play.sample_rate,
-@@ -290,13 +301,13 @@
+@@ -290,13 +300,13 @@ active           :   %s
      info.play.waiting ? "yes" : "no",
      info.play.active ? "yes": "no");
  
@@ -108,7 +100,7 @@
  ",  
      info.monitor_gain,
      info.blocksize,
-@@ -388,6 +399,9 @@
+@@ -388,6 +398,9 @@ OBSD_OpenAudio(_THIS, SDL_AudioSpec *spe
        spec->channels = 1;
      AUDIO_INITINFO(&info);
      info.play.sample_rate = spec->freq;
diff -r b23372c9f253 -r 1bde30817ad3 devel/SDL/patches/patch-am
--- a/devel/SDL/patches/patch-am        Tue Feb 07 18:00:41 2006 +0000
+++ b/devel/SDL/patches/patch-am        Tue Feb 07 18:15:50 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.18 2005/09/07 10:15:39 adam Exp $
+$NetBSD: patch-am,v 1.19 2006/02/07 18:15:50 wiz Exp $
 
---- configure.orig     2005-08-28 06:32:11.000000000 +0000
+--- configure.orig     2005-08-28 08:32:11.000000000 +0200
 +++ configure
 @@ -463,7 +463,8 @@ ac_includes_default="\
  # include <unistd.h>
@@ -55,115 +55,7 @@
                    ;;
              esac
  
-@@ -25684,63 +25687,58 @@ else
-   enable_video_aalib=no
- fi;
-     if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
--        echo "$as_me:$LINENO: checking for AAlib support" >&5
--echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
--        video_aalib=no
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--         #include <aalib.h>
--
--int
--main ()
--{
--
--
--  ;
--  return 0;
--}
--_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
-+        # Extract the first word of "aalib-config", so it can be a program name with args.
-+set dummy aalib-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_AALIB_CONFIG+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $AALIB_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_AALIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
- 
--        video_aalib=yes
-+  ;;
-+esac
-+fi
-+AALIB_CONFIG=$ac_cv_path_AALIB_CONFIG
- 
-+if test -n "$AALIB_CONFIG"; then
-+  echo "$as_me:$LINENO: result: $AALIB_CONFIG" >&5
-+echo "${ECHO_T}$AALIB_CONFIG" >&6
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+        echo "$as_me:$LINENO: checking for AAlib support" >&5
-+echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
-+        if test x$AALIB_CONFIG = x; then
-+        video_aalib=no
-+      else
-+            AALIB_LIBS=`$AALIB_CONFIG --libs`
-+        video_aalib=yes
-+        fi
-         echo "$as_me:$LINENO: result: $video_aalib" >&5
- echo "${ECHO_T}$video_aalib" >&6
-         if test x$video_aalib = xyes; then
-             CFLAGS="$CFLAGS -DENABLE_AALIB"
--            SYSTEM_LIBS="$SYSTEM_LIBS -laa"
-+            SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS"
- 
-             VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
-             VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -26755,16 +26753,17 @@ else
+@@ -26755,16 +26758,17 @@ else
    enable_pth=yes
  fi;
      if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -186,7 +78,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -26774,32 +26773,32 @@ do
+@@ -26774,32 +26778,32 @@ do
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
    if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
@@ -228,7 +120,7 @@
              SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
              SDL_LIBS="$SDL_LIBS $PTH_LIBS"
              CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -26847,9 +26846,13 @@ fi;
+@@ -26847,9 +26851,13 @@ fi;
              pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              pthread_lib="-pthread"
              ;;
@@ -244,7 +136,7 @@
              ;;
          *-*-openbsd*)
              pthread_cflags="-D_REENTRANT"
-@@ -28677,93 +28680,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
+@@ -28677,93 +28685,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes
    have_libusbhid=yes
  fi
  
@@ -346,7 +238,7 @@



Home | Main Index | Thread Index | Old Index