Update schismtracker to 20160913.

Among other things, this update fixes log2() function detection and
doesn't attempt to link against libdl, so we can shorten one of the
patches and drop the other.

OK juanfra@
This commit is contained in:
fcambus 2016-09-27 08:51:24 +00:00
parent 23a66a19c8
commit 1114990776
4 changed files with 12 additions and 38 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2016/09/22 12:57:17 fcambus Exp $
# $OpenBSD: Makefile,v 1.7 2016/09/27 08:51:24 fcambus Exp $
COMMENT = open-source reimplementation of Impulse Tracker
GH_ACCOUNT = schismtracker
GH_PROJECT = schismtracker
GH_TAGNAME = 20160521
REVISION = 0
GH_TAGNAME = 20160913
CATEGORIES = audio x11

View File

@ -1,2 +1,2 @@
SHA256 (schismtracker-20160521.tar.gz) = n0kCjb98kP0KnwxmS0fkecgebU90aoYkqY3mUTkR2TA=
SIZE (schismtracker-20160521.tar.gz) = 1026780
SHA256 (schismtracker-20160913.tar.gz) = PC/OpFi6e0G8xj7nhsfu8L/od1Y5o9uPq4Y+EvEIiOk=
SIZE (schismtracker-20160913.tar.gz) = 1030790

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-Makefile_am,v 1.1 2016/09/01 12:47:22 fcambus Exp $
OpenBSD doesn't need libdl
--- Makefile.am.orig Sat May 21 16:40:41 2016
+++ Makefile.am Sat Aug 13 21:17:33 2016
@@ -358,8 +358,3 @@ AM_OBJCFLAGS = $(AM_CFLAGS)
schismtracker_DEPENDENCIES = $(files_windres)
schismtracker_LDADD = $(lib_asound) $(lib_win32) $(SDL_LIBS) $(LIBM)
-
-if ! USE_WIN32
-schismtracker_LDADD += -ldl
-endif
-

View File

@ -1,27 +1,17 @@
$OpenBSD: patch-configure_ac,v 1.1 2016/09/01 12:47:22 fcambus Exp $
$OpenBSD: patch-configure_ac,v 1.2 2016/09/27 08:51:24 fcambus Exp $
- Prevent calling Git to obtain date of the last commit, and hardcode
[last_git_commit] value to match package version
- Fix log2() function detection
Prevent calling Git to obtain date of the last commit, and hardcode
[last_git_commit] value to match package version.
--- configure.ac.orig Sat May 21 16:40:41 2016
+++ configure.ac Fri Aug 19 22:54:30 2016
@@ -21,9 +21,7 @@ dnl You should have received a copy of the GNU General
dnl along with this program; if not, write to the Free Software
--- configure.ac.orig Tue Sep 13 21:21:08 2016
+++ configure.ac Fri Sep 23 18:28:00 2016
@@ -22,8 +22,7 @@ dnl along with this program; if not, write to the Free
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-dnl PACKAGE_VERSION will be either " " if not using git, or date of the last git commit in the form YYYYMMDD
dnl PACKAGE_VERSION will be either "" if not using git, or date of the last git commit in the form YYYYMMDD
-m4_define([last_git_commit], patsubst(m4_esyscmd([git log -n 1 --date=short --format=format:%cd]), [[^0-9]]))
-AC_INIT([schismtracker], [last_git_commit])
+AC_INIT([schismtracker], [20160521])
+AC_INIT([schismtracker], [20160913])
AC_CONFIG_SRCDIR([schism/main.c])
@@ -58,6 +56,7 @@ dnl Check for SDL libs
AM_PATH_SDL(1.2.10, , AC_MSG_ERROR([*** SDL version >= 1.2.10 not found.]))
dnl Functions
+AC_CHECK_LIB([m], [log2])
AC_CHECK_FUNCS(strchr memmove strerror strtol strcasecmp strncasecmp strverscmp stricmp strnicmp strcasestr strptime asprintf vasprintf memcmp mmap nice unsetenv dup fnmatch log2 mkstemp)
AM_CONDITIONAL([NEED_ASPRINTF], [test "$ac_cv_func_asprintf" = "no"])
AM_CONDITIONAL([NEED_VASPRINTF], [test "$ac_cv_func_vasprintf" = "no"])