From fa58fb04dbf7f96de86329fdbb5378d784563323 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 19 Nov 2012 15:06:51 +0000 Subject: [PATCH] Update to milkytracker 0.90.85, from dhn at freebsd, minor tweaks by me. --- audio/milkytracker/Makefile | 15 ++++--- audio/milkytracker/distinfo | 7 +-- audio/milkytracker/patches/patch-configure_in | 12 +++++ ...ilkyplay_drivers_jack_AudioDriver_JACK_cpp | 12 ----- .../patch-src_tracker_sdl_SDL_Main_cpp | 45 +++++++++++++++++++ 5 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 audio/milkytracker/patches/patch-configure_in delete mode 100644 audio/milkytracker/patches/patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp create mode 100644 audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp diff --git a/audio/milkytracker/Makefile b/audio/milkytracker/Makefile index bc5103f3c7e..e43f28bd162 100644 --- a/audio/milkytracker/Makefile +++ b/audio/milkytracker/Makefile @@ -1,30 +1,31 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/15 00:22:47 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2012/11/19 15:06:51 sthen Exp $ COMMENT = Fasttracker II inspired MOD tracker -DISTNAME = milkytracker-0.90.80 +DISTNAME = milkytracker-0.90.85 CATEGORIES = audio -HOMEPAGE = http://www.milkytracker.net/ +HOMEPAGE = http://www.milkytracker.org/ MAINTAINER = Jacob Meuser -# GPL v3 +# GPLv3+ PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = SDL c m pthread stdc++ +WANTLIB = SDL c m pthread stdc++ z -MASTER_SITES = ${HOMEPAGE}/files/ +MASTER_SITES = ${HOMEPAGE}files/ # libjack accessed via dlopen() RUN_DEPENDS = audio/jack BUILD_DEPENDS = ${RUN_DEPENDS} LIB_DEPENDS = devel/sdl -CONFIGURE_STYLE = gnu +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.64 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/milkytracker/distinfo b/audio/milkytracker/distinfo index 012e2e7aeaf..66b9566f976 100644 --- a/audio/milkytracker/distinfo +++ b/audio/milkytracker/distinfo @@ -1,5 +1,2 @@ -MD5 (milkytracker-0.90.80.tar.gz) = IUykLSIzmCLtpNHht0dkvw== -RMD160 (milkytracker-0.90.80.tar.gz) = aOhMiVn6WR03tSMvkpI5QQ1vw8g= -SHA1 (milkytracker-0.90.80.tar.gz) = /ZLvQwGoqw/PSU7V2RgS98GL6ig= -SHA256 (milkytracker-0.90.80.tar.gz) = Ip2pFMNkE8/pvBw3Hk9rd+BlIjjU7AIkEmoAa4SVlSM= -SIZE (milkytracker-0.90.80.tar.gz) = 2201555 +SHA256 (milkytracker-0.90.85.tar.gz) = +7oPvtbe4tXuLH/EjCbnsinHhVnUQB2MCoZsmyaYl6A= +SIZE (milkytracker-0.90.85.tar.gz) = 3057134 diff --git a/audio/milkytracker/patches/patch-configure_in b/audio/milkytracker/patches/patch-configure_in new file mode 100644 index 00000000000..6fb14a4e5b1 --- /dev/null +++ b/audio/milkytracker/patches/patch-configure_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure_in,v 1.1 2012/11/19 15:06:51 sthen Exp $ +--- configure.in.orig Thu Sep 17 20:35:47 2009 ++++ configure.in Mon Nov 19 13:14:12 2012 +@@ -43,7 +43,7 @@ fi + + AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),) + #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip")) +-PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75]) ++#PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75]) + + SDL_VERSION=1.2.0 + AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL])) diff --git a/audio/milkytracker/patches/patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp b/audio/milkytracker/patches/patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp deleted file mode 100644 index 886872668cf..00000000000 --- a/audio/milkytracker/patches/patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_milkyplay_drivers_jack_AudioDriver_JACK_cpp,v 1.1.1.1 2008/05/11 07:09:03 jakemsr Exp $ ---- src/milkyplay/drivers/jack/AudioDriver_JACK.cpp.orig Fri May 2 17:07:03 2008 -+++ src/milkyplay/drivers/jack/AudioDriver_JACK.cpp Fri May 2 17:20:30 2008 -@@ -64,6 +64,8 @@ int AudioDriver_JACK::jackProcess(jack_nframes_t nfram - leftBuffer[in] = audioDriver->rawStream[out++] * (1.0/32768.0); - rightBuffer[in] = audioDriver->rawStream[out++] * (1.0/32768.0); - } -+ -+ return 0; - } - - AudioDriver_JACK::AudioDriver_JACK() : diff --git a/audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp b/audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp new file mode 100644 index 00000000000..fb465f8126e --- /dev/null +++ b/audio/milkytracker/patches/patch-src_tracker_sdl_SDL_Main_cpp @@ -0,0 +1,45 @@ +$OpenBSD: patch-src_tracker_sdl_SDL_Main_cpp,v 1.1 2012/11/19 15:06:51 sthen Exp $ +--- src/tracker/sdl/SDL_Main.cpp.orig Sun Nov 18 21:28:51 2012 ++++ src/tracker/sdl/SDL_Main.cpp Sun Nov 18 21:33:18 2012 +@@ -751,8 +751,8 @@ void processSDLUserEvents(const SDL_UserEvent& event) + case SDLUserEventLMouseRepeat: + { + PPPoint p; +- p.x = (pp_int32)event.data1; +- p.y = (pp_int32)event.data2; ++ p.x = reinterpret_cast (event.data1); ++ p.y = reinterpret_cast (event.data2); + PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint)); + RaiseEventSerialized(&myEvent); + break; +@@ -761,8 +761,8 @@ void processSDLUserEvents(const SDL_UserEvent& event) + case SDLUserEventRMouseRepeat: + { + PPPoint p; +- p.x = (pp_int32)event.data1; +- p.y = (pp_int32)event.data2; ++ p.x = reinterpret_cast (event.data1); ++ p.y = reinterpret_cast (event.data2); + PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint)); + RaiseEventSerialized(&myEvent); + break; +@@ -770,8 +770,8 @@ void processSDLUserEvents(const SDL_UserEvent& event) + + case SDLUserEventMidiKeyDown: + { +- pp_int32 note = (pp_int32)event.data1; +- pp_int32 volume = (pp_int32)event.data2; ++ pp_int32 note = reinterpret_cast (event.data1); ++ pp_int32 volume = reinterpret_cast (event.data2); + globalMutex->lock(); + myTracker->sendNoteDown(note, volume); + globalMutex->unlock(); +@@ -780,7 +780,7 @@ void processSDLUserEvents(const SDL_UserEvent& event) + + case SDLUserEventMidiKeyUp: + { +- pp_int32 note = (pp_int32)event.data1; ++ pp_int32 note = reinterpret_cast (event.data1); + globalMutex->lock(); + myTracker->sendNoteUp(note); + globalMutex->unlock();