Update to milkytracker 0.90.85, from dhn at freebsd, minor tweaks by me.

This commit is contained in:
sthen 2012-11-19 15:06:51 +00:00
parent 921886ba9e
commit fa58fb04db
5 changed files with 67 additions and 24 deletions

View File

@ -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 <jakemsr@openbsd.org>
# 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"

View File

@ -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

View File

@ -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]))

View File

@ -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() :

View File

@ -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<intptr_t> (event.data1);
+ p.y = reinterpret_cast<intptr_t> (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<intptr_t> (event.data1);
+ p.y = reinterpret_cast<intptr_t> (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<intptr_t> (event.data1);
+ pp_int32 volume = reinterpret_cast<intptr_t> (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<intptr_t> (event.data1);
globalMutex->lock();
myTracker->sendNoteUp(note);
globalMutex->unlock();