pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openfmod: remove redundant patch hunks



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sun Jan 24 10:33:27 2021 +0200
Changeset:	a884725660272f1a2ea5a09aaf3c9d53de1aaba6

Modified Files:
	openfmod/distinfo
	openfmod/patches/patch-src_fmod-studio.c

Log Message:
openfmod: remove redundant patch hunks

Following upstream review comments.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a884725660272f1a2ea5a09aaf3c9d53de1aaba6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 openfmod/distinfo                        |  2 +-
 openfmod/patches/patch-src_fmod-studio.c | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diffs:
diff --git a/openfmod/distinfo b/openfmod/distinfo
index 94d96ec01b..612b5019e3 100644
--- a/openfmod/distinfo
+++ b/openfmod/distinfo
@@ -6,5 +6,5 @@ SHA512 (openfmod/04e63e9b0ba1562db32570a0a7b68030c289dd89-04e63e9b0ba1562db32570
 Size (openfmod/04e63e9b0ba1562db32570a0a7b68030c289dd89-04e63e9b0ba1562db32570a0a7b68030c289dd89.tar.gz) = 26809 bytes
 SHA1 (patch-include_openfmod-internal.h) = 9b1fcd0c8e8d682b08819b68b56ebb32a430b1b3
 SHA1 (patch-makefile) = c8480b3f69962acea11232220eda1f32fe113cec
-SHA1 (patch-src_fmod-studio.c) = 74bbd5411d3badc80c04e69d7e7f63cb834a5696
+SHA1 (patch-src_fmod-studio.c) = 72b37404764bc9cee198141138e503952e1cc83a
 SHA1 (patch-src_fsb-file.c) = 56ecead87136242f49275bed24d0235baafc7ef8
diff --git a/openfmod/patches/patch-src_fmod-studio.c b/openfmod/patches/patch-src_fmod-studio.c
index 5fbee606c5..d275b62bfd 100644
--- a/openfmod/patches/patch-src_fmod-studio.c
+++ b/openfmod/patches/patch-src_fmod-studio.c
@@ -4,27 +4,12 @@ New gorilla-audio support
 
 --- src/fmod-studio.c.orig	2020-11-09 09:14:31.000000000 +0000
 +++ src/fmod-studio.c
-@@ -21,11 +21,11 @@ FMOD_RESULT FMOD_Studio_System_Create(FM
+@@ -21,7 +21,7 @@ FMOD_RESULT FMOD_Studio_System_Create(FM
  
  	FMOD_STUDIO_SYSTEM *ret = calloc(sizeof(FMOD_STUDIO_SYSTEM), 1);
  	if (!ret) return FMOD_ERR_INTERNAL;
 -	ret->ga.mgr = gau_manager_create_custom(ga_DeviceType_Default, GAU_THREAD_POLICY_MULTI, 4, 512);
-+	ret->ga.mgr = GauManager_create_custom(GaDeviceType_Default, GauThreadPolicy_Single, 4, 512);
++	ret->ga.mgr = gau_manager_create_custom(GaDeviceType_Default, GauThreadPolicy_Single, 4, 512);
  	if (!ret->ga.mgr) return FMOD_ERR_INTERNAL;
--	ret->ga.mixer = gau_manager_mixer(ret->ga.mgr);
-+	ret->ga.mixer = GauManager_mixer(ret->ga.mgr);
+ 	ret->ga.mixer = gau_manager_mixer(ret->ga.mgr);
  	if (!ret->ga.mixer) return FMOD_ERR_INTERNAL;
--	ret->ga.stream_mgr = gau_manager_streamManager(ret->ga.mgr);
-+	ret->ga.stream_mgr = GauManager_streamManager(ret->ga.mgr);
- 
- 	*system = ret;
- 	return FMOD_OK;
-@@ -102,7 +102,7 @@ FMOD_RESULT FMOD_Studio_System_GetVCA(FM
- }
- 
- FMOD_RESULT FMOD_Studio_System_Update(FMOD_STUDIO_SYSTEM *system) {
--	gau_manager_update(system->ga.mgr);
-+	GauManager_update(system->ga.mgr);
- 	return FMOD_OK;
- }
- 


Home | Main Index | Thread Index | Old Index