audio/libsidplay: update to 1.36.59, fix data type width

* Update to 1.36.59, found on Gentoo.

* Fix the "dword" data types to be 32 bits even on 64-bit platforms.
  This fixes sid2wav from audio/sidplay.
  Based on a patch by Dave Vandervies.

* Drop maintainer.
This commit is contained in:
naddy 2022-08-15 20:39:14 +00:00
parent 494c4d8d3b
commit 45aca3b4bd
5 changed files with 25 additions and 39 deletions

View File

@ -1,12 +1,9 @@
COMMENT= C64 music player and SID chip emulator library
DISTNAME= libsidplay-1.36.57
REVISION= 7
DISTNAME= libsidplay-1.36.59
CATEGORIES= audio
SHARED_LIBS += sidplay 2.0 # .1.3
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
# GPL
PERMIT_PACKAGE= Yes

View File

@ -1,2 +1,2 @@
SHA256 (libsidplay-1.36.57.tgz) = QpYcJeojNFWJzp5T/iZzN+NhfQUlojzAR/y9MlzM2XA=
SIZE (libsidplay-1.36.57.tgz) = 242267
SHA256 (libsidplay-1.36.59.tgz) = PamzjU61v56Ta5YEupLaBZTvOAR9UM+Aao4RxAAAgCQ=
SIZE (libsidplay-1.36.59.tgz) = 390097

View File

@ -1,14 +1,15 @@
--- configure.orig Sun Apr 16 10:48:30 2017
+++ configure Sun Apr 16 10:48:52 2017
@@ -1279,8 +1279,9 @@ else
#line 1280 "configure"
#include "confdefs.h"
Index: configure
--- configure.orig
+++ configure
@@ -2869,8 +2869,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
+using namespace std;
int main() {
int
main ()

View File

@ -0,0 +1,14 @@
Index: src/mytypes.h
--- src/mytypes.h.orig
+++ src/mytypes.h
@@ -31,8 +31,8 @@ typedef signed short int sword;
typedef unsigned short int uword;
// Wanted: 32-bit signed/unsigned.
-typedef signed long int sdword;
-typedef unsigned long int udword;
+typedef signed int sdword;
+typedef unsigned int udword;
// Some common type shortcuts.

View File

@ -1,26 +0,0 @@
--- src/smart.h.orig Tue May 11 23:07:35 2010
+++ src/smart.h Tue May 11 23:16:56 2010
@@ -211,16 +211,16 @@ class smartPtr : public smartPtrBase<T>
{
if ( bufferLen >= 1 )
{
- pBufCurrent = ( bufBegin = buffer );
- bufEnd = bufBegin + bufferLen;
- bufLen = bufferLen;
- status = true;
+ this->pBufCurrent = ( this->bufBegin = buffer );
+ this->bufEnd = this->bufBegin + bufferLen;
+ this->bufLen = bufferLen;
+ this->status = true;
}
else
{
- pBufCurrent = bufBegin = bufEnd = 0;
- bufLen = 0;
- status = false;
+ this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
+ this->bufLen = 0;
+ this->status = false;
}
}
};