pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/milkytracker milkytracker: Update to 1.02.00
details: https://anonhg.NetBSD.org/pkgsrc/rev/6876253f5291
branches: trunk
changeset: 340047:6876253f5291
user: nia <nia%pkgsrc.org@localhost>
date: Sat Sep 21 11:32:08 2019 +0000
description:
milkytracker: Update to 1.02.00
- Switch distfile source to github.
- Switch to SDL2.
- Install desktop file and icons.
- This release fixes multiple potential memory corruption bugs in the
various module importers.
diffstat:
audio/milkytracker/MESSAGE | 12 --
audio/milkytracker/Makefile | 45 +++++---
audio/milkytracker/PLIST | 16 ++-
audio/milkytracker/distinfo | 12 +-
audio/milkytracker/options.mk | 22 ----
audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp | 18 ---
audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp | 46 ----------
7 files changed, 43 insertions(+), 128 deletions(-)
diffs (219 lines):
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/MESSAGE
--- a/audio/milkytracker/MESSAGE Sat Sep 21 11:28:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2009/08/27 22:50:16 ahoka Exp $
-
- Since SDL is utilizing X shared memory extensions, you
- might need to raise the maximum limit of shared memory pages
- for running milkytracker properly.
-
-
- Documentation for MilkyTracker is installed in:
- ${PREFIX}/share/doc/milkytracker
-
-===========================================================================
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/Makefile
--- a/audio/milkytracker/Makefile Sat Sep 21 11:28:00 2019 +0000
+++ b/audio/milkytracker/Makefile Sat Sep 21 11:32:08 2019 +0000
@@ -1,32 +1,41 @@
-# $NetBSD: Makefile,v 1.11 2018/09/28 06:34:32 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.12 2019/09/21 11:32:08 nia Exp $
-DISTNAME= milkytracker-0.90.86
-PKGREVISION= 1
+DISTNAME= milkytracker-1.02.00
CATEGORIES= audio
-MASTER_SITES= http://milkytracker.org/files/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=milkytracker/}
+GITHUB_PROJECT= MilkyTracker
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= jkuittinen%users.sourceforge.net@localhost
-HOMEPAGE= http://milkytracker.org/
+HOMEPAGE= https://milkytracker.titandemo.org/
COMMENT= Music tracker inspired by Fast Tracker 2
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
+USE_CMAKE= yes
+USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++03
-USE_TOOLS+= gawk
-.include "options.mk"
-
-INSTALLATION_DIRS+= share/doc/milkytracker
-INSTALLATION_DIRS+= share/examples/milkytracker
-
-DOCDIR= ${DESTDIR}${PREFIX}/share/doc/milkytracker
+INSTALLATION_DIRS+= share/appdata
+INSTALLATION_DIRS+= share/applications
+INSTALLATION_DIRS+= share/pixmaps
post-install:
- ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/resources/pictures/carton.png \
+ ${DESTDIR}${PREFIX}/share/pixmaps/milkytracker.png
+ ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.appdata \
+ ${DESTDIR}${PREFIX}/share/appdata/milkytracker.appdata.xml
+ ${INSTALL_DATA} ${WRKSRC}/resources/milkytracker.desktop \
+ ${DESTDIR}${PREFIX}/share/applications
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.include "../../archivers/lhasa/buildlink3.mk"
+.include "../../archivers/zziplib/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.endif
+.if ${OPSYS} == "Linux"
+.include "../../audio/alsa-lib/buildlink3.mk"
+.include "../../audio/jack/buildlink3.mk"
+.endif
.include "../../devel/zlib/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/PLIST
--- a/audio/milkytracker/PLIST Sat Sep 21 11:28:00 2019 +0000
+++ b/audio/milkytracker/PLIST Sat Sep 21 11:32:08 2019 +0000
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2014/09/12 21:31:39 shattered Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/09/21 11:32:08 nia Exp $
bin/milkytracker
+share/appdata/milkytracker.appdata.xml
+share/applications/milkytracker.desktop
+share/doc/milkytracker/Authors.txt
share/doc/milkytracker/ChangeLog.html
+share/doc/milkytracker/Copying.txt
share/doc/milkytracker/FAQ.html
share/doc/milkytracker/MilkyTracker.html
share/doc/milkytracker/TiTAN.nfo
-share/doc/milkytracker/readme_OSX.html
-share/doc/milkytracker/readme_PocketPC.html
-share/doc/milkytracker/readme_rtaudio
-share/doc/milkytracker/readme_unix
+share/milkytracker/songs/milky.xm
+share/milkytracker/songs/slumberjack.xm
+share/milkytracker/songs/sv_ttt.xm
+share/milkytracker/songs/theday.xm
+share/milkytracker/songs/universalnetwork2_real.xm
+share/pixmaps/milkytracker.png
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/distinfo
--- a/audio/milkytracker/distinfo Sat Sep 21 11:28:00 2019 +0000
+++ b/audio/milkytracker/distinfo Sat Sep 21 11:32:08 2019 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:12:41 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/09/21 11:32:08 nia Exp $
-SHA1 (milkytracker-0.90.86.tar.bz2) = 620bc1f81894f526d9e806189c5f7f17c3b57b97
-RMD160 (milkytracker-0.90.86.tar.bz2) = 09a4913d737362c42d16a4bcfc1de69e1d1bdbd4
-SHA512 (milkytracker-0.90.86.tar.bz2) = 8142f0b438e478571db25960d1b31f1d8c7e68feea96bdd238d1b1c1744105d929f18c990a301af6bebfc2d517bad687232410477ced6d8c4bfec8053cfcad8e
-Size (milkytracker-0.90.86.tar.bz2) = 2202256 bytes
-SHA1 (patch-src_compression_zziplib_generic_fseeko.cpp) = 002754ec91a5d3b986fabe9266cc8999ac148c82
-SHA1 (patch-src_tracker_TrackerStartup.cpp) = 389ef435b0cd7c67bec81c5e2e450590d7224dca
+SHA1 (milkytracker-1.02.00.tar.gz) = 04c04fd429316cabe197baa1c510c4a81e9aef40
+RMD160 (milkytracker-1.02.00.tar.gz) = 1376ce67426b46e90f871c48ef5469ec6eae46c7
+SHA512 (milkytracker-1.02.00.tar.gz) = 479a7b3198d97c68dca4fa772a2aa64d7f740957f5d8038fabfb303e724c85aec0865746a0a5c3ef6b9599b78892dcda22727ab2bb80ae38764bcf81b249e134
+Size (milkytracker-1.02.00.tar.gz) = 3753882 bytes
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/options.mk
--- a/audio/milkytracker/options.mk Sat Sep 21 11:28:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2014/01/02 06:34:14 dholland Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.milkytracker
-#PKG_SUPPORTED_OPTIONS= alsa jack
-PKG_SUPPORTED_OPTIONS= jack
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-#.if !empty(PKG_OPTIONS:Malsa)
-#CONFIGURE_ARGS+= --with-alsa
-#.else
-CONFIGURE_ARGS+= --without-alsa
-#.endif
-
-
-.if !empty(PKG_OPTIONS:Mjack)
-.include "../../audio/jack/buildlink3.mk"
-CONFIGURE_ARGS+= --with-jack
-.else
-CONFIGURE_ARGS+= --without-jack
-.endif
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp
--- a/audio/milkytracker/patches/patch-src_compression_zziplib_generic_fseeko.cpp Sat Sep 21 11:28:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_compression_zziplib_generic_fseeko.cpp,v 1.2 2012/03/15 20:16:24 hans Exp $
-
---- src/compression/zziplib/generic/fseeko.cpp.orig 2008-01-05 17:33:45.000000000 +0000
-+++ src/compression/zziplib/generic/fseeko.cpp
-@@ -52,13 +52,8 @@
- #include <zzip___mmap.h>
- #include <zzip___fnmatch.h>
-
--#if __STDC_VERSION__+0 > 199900L
--#define ___
--#define ____
--#else
- #define ___ {
- #define ____ }
--#endif
-
- #ifndef ZZIP_HAVE_FSEEKO
- #define fseeko fseek
diff -r b9b4a97a4bbd -r 6876253f5291 audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp
--- a/audio/milkytracker/patches/patch-src_tracker_TrackerStartup.cpp Sat Sep 21 11:28:00 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-src_tracker_TrackerStartup.cpp,v 1.2 2015/06/25 06:01:01 dholland Exp $
-
-Taking the absolute value of the difference of two values doesn't work
-if the difference is unsigned. Do something else semi-reasonable
-instead for the case when the clock goes backwards.
-
---- src/tracker/TrackerStartUp.cpp.orig 2013-11-09 00:12:01.000000000 +0000
-+++ src/tracker/TrackerStartUp.cpp
-@@ -119,14 +119,16 @@ void Tracker::showSplash()
- pp_int32 deltaT = 100;
- while (shade <= 256.0f)
- {
-- pp_int32 startTime = ::PPGetTickCount();
-+ pp_uint32 startTime = ::PPGetTickCount();
- #if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__)
- screen->paintSplash(LogoSmall::rawData, LogoSmall::width, LogoSmall::height, LogoSmall::width*4, 4, (int)shade);
- #else
- screen->paintSplash(LogoBig::rawData, LogoBig::width, LogoBig::height, LogoBig::width*3, 3, (int)shade);
- #endif
- shade+=deltaT * (1.0f/6.25f);
-- deltaT = abs(::PPGetTickCount() - startTime);
-+ pp_uint32 nowTime = ::PPGetTickCount();
-+ /* just in case the clock goes backwards */
-+ deltaT = nowTime > startTime ? nowTime - startTime : 0;
- if (!deltaT) deltaT++;
- }
- #if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__)
-@@ -150,14 +152,16 @@ void Tracker::hideSplash()
- pp_int32 deltaT = 100;
- while (shade >= 0.0f)
- {
-- pp_int32 startTime = ::PPGetTickCount();
-+ pp_uint32 startTime = ::PPGetTickCount();
- #if defined(__EXCLUDE_BIGLOGO__) || defined(__LOWRES__)
- screen->paintSplash(LogoSmall::rawData, LogoSmall::width, LogoSmall::height, LogoSmall::width*4, 4, (int)shade);
- #else
- screen->paintSplash(LogoBig::rawData, LogoBig::width, LogoBig::height, LogoBig::width*3, 3, (int)shade);
- #endif
- shade-=deltaT * (1.0f/6.25f);
-- deltaT = abs(::PPGetTickCount() - startTime);
-+ pp_uint32 nowTime = ::PPGetTickCount();
-+ /* just in case the clock goes backwards */
-+ deltaT = nowTime > startTime ? nowTime - startTime : 0;
- if (!deltaT) deltaT++;
- }
- screen->clear();
Home |
Main Index |
Thread Index |
Old Index