[mupen64plus-core] 61/310: Ensure all definition for front-ends is in public headers

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit b5ae4f129ad011cad77b54de6c46bf0623c76871
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu Dec 30 00:03:58 2010 +0100

    Ensure all definition for front-ends is in public headers
---
 debian/changelog                |  3 ++-
 debian/patches/api_header.patch | 60 +++++++++++++++++++++++++++++------------
 2 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43633b8..cb62180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ mupen64plus-core (1.99.4-1) UNRELEASED; urgency=low
   * Split source package to match upstreams modular release packages
   * debian/patches:
     - Add printf_fixup.patch, Correct usage of printf format strings
-    - Add api_header.patch, Install all api header files
+    - Add api_header.patch, Ensure all definition for front-ends is in public
+      headers
     - Rebase default-optimisations.patch and dejavu-font.patch
       against 1.99.4
     - Remove upstream merged patches: as-needed.patch,
diff --git a/debian/patches/api_header.patch b/debian/patches/api_header.patch
index e5a79a1..8846dba 100644
--- a/debian/patches/api_header.patch
+++ b/debian/patches/api_header.patch
@@ -1,20 +1,46 @@
-Description: Install all api header files
- Frontends like wxmupen64plus use the core headers config.h and callbacks.h that
- weren't installed by default. These are valid api headers and not only
- providing internal function.
-Author: Sven Eckelmann <sven at narfation.org>
+Description: Ensure all definition for front-ends is in public headers
+ moved callback function pointer typedefs from callbacks.h into m64p_frontend.h,
+ so that they may be used by front-end apps
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-core/changeset/a838c54b5f78
+Author: Richard Goedeken <Richard at fascinationsoftware.com>
 
 ---
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 76022627dd390aaa94c7f95ae27a3c70d7caac89..5f0fe608cb0c108dbdd207eb7d7d045043e12bb4 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -361,7 +361,7 @@ install: $(TARGET)
- 	$(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"
- 	$(INSTALL) -m 0644 ../../data/mupen64plus.* "$(DESTDIR)$(SHAREDIR)"
- 	$(INSTALL) -d -v "$(DESTDIR)$(INCDIR)"
--	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
-+	$(INSTALL) -m 0644 ../../src/api/*.h "$(DESTDIR)$(INCDIR)"
- 	if [ `id -u` -eq 0 ]; then $(LDCONFIG); fi
+diff --git a/src/api/callbacks.h b/src/api/callbacks.h
+index 33c63d8f8aa4af12ad92c727988efe0d2c99ed05..55a84bcb9c61339b2795a0c91add3f04d83c0ab8 100644
+--- a/src/api/callbacks.h
++++ b/src/api/callbacks.h
+@@ -27,10 +27,7 @@
+ #define API_CALLBACKS_H
  
- uninstall:
+ #include "m64p_types.h"
+-
+-/* pointer types to the callback functions in the front-end application */
+-typedef void (*ptr_DebugCallback)(void *Context, int level, const char *message);
+-typedef void (*ptr_StateCallback)(void *Context, m64p_core_param param_type, int new_value);
++#include "m64p_frontend.h"
+ 
+ /* Functions for use by the Core, to send information back to the front-end app */
+ extern m64p_error SetDebugCallback(ptr_DebugCallback pFunc, void *Context);
+diff --git a/src/api/m64p_frontend.h b/src/api/m64p_frontend.h
+index 8aaae6db36edbfd59d8123dc4ae994ed5c4d58c5..14d91888d7540a2eb1406a9a2424a87b30863c10 100644
+--- a/src/api/m64p_frontend.h
++++ b/src/api/m64p_frontend.h
+@@ -28,12 +28,17 @@
+ 
+ #include "m64p_types.h"
+ 
++
++/* pointer types to the callback functions in the front-end application */
++typedef void (*ptr_DebugCallback)(void *Context, int level, const char *message);
++typedef void (*ptr_StateCallback)(void *Context, m64p_core_param param_type, int new_value);
++
+ /* CoreStartup()
+  *
+  * This function initializes libmupen64plus for use by allocating memory,
+  * creating data structures, and loading the configuration file.
+  */
+-typedef m64p_error (*ptr_CoreStartup)(int, const char *, const char *, void *, void (*)(void *, int, const char *), void *, void (*)(void *, m64p_core_param, int));
++typedef m64p_error (*ptr_CoreStartup)(int, const char *, const char *, void *, ptr_DebugCallback, void *, ptr_StateCallback);
+ 
+ /* CoreShutdown()
+  *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git