Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 video/guvcview/DETAILS                                        |    4 
 video/guvcview/HISTORY                                        |    5 
 video/guvcview/PRE_BUILD                                      |    3 
 video/guvcview/patches/0001-fix-building-with-musl-libc.patch |  120 
++++++++++
 4 files changed, 129 insertions(+), 3 deletions(-)

New commits:
commit 4868d2a0446318854ec303724c0b1938eaf9f42e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    guvcview: Fix build against musl

commit 0ae314135749f3dd979b1545974b0047db4f2c9f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    guvcview 2.0.6

diff --git a/video/guvcview/DETAILS b/video/guvcview/DETAILS
index 10f64d8..b8fe03a 100755
--- a/video/guvcview/DETAILS
+++ b/video/guvcview/DETAILS
@@ -1,8 +1,8 @@
            SPELL=guvcview
-         VERSION=2.0.2
+         VERSION=2.0.6
           SOURCE=${SPELL}-src-${VERSION}.tar.gz
    SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-     
SOURCE_HASH=sha512:927b3b49ec55acc633384b6b59605943750b3b9248f69bcba83382f189ae26e4e38922f2f42444ee8678c157fade8d366808a46f85143139bbe3a603f4985cdb
+     
SOURCE_HASH=sha512:f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src-${VERSION}"
         WEB_SITE=http://guvcview.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/video/guvcview/HISTORY b/video/guvcview/HISTORY
index 4ddc26d..0573cf4 100644
--- a/video/guvcview/HISTORY
+++ b/video/guvcview/HISTORY
@@ -1,3 +1,8 @@
+2021-07-31 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS, PRE_BUILD: updated spell to 2.0.6
+       * PRE_BUILD, patches/0001-fix-building-with-musl-libc.patch:
+         Fixed build against musl
+
 2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
        * DEPENDS: Update dependency; s/gettext/GETTEXT/
 
diff --git a/video/guvcview/PRE_BUILD b/video/guvcview/PRE_BUILD
index 1fcd450..e00df85 100755
--- a/video/guvcview/PRE_BUILD
+++ b/video/guvcview/PRE_BUILD
@@ -1,8 +1,9 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
 
 if [[ ! -f "$INSTALL_ROOT/usr/include/linux/uvcvideo.h" ]]; then
   patch -p1 < "$SPELL_DIRECTORY/linux-2.patch"
 fi &&
 
-sed -i -e '29i#include <locale.h>' guvcview/options.c
+sed -i -e '31i#include <locale.h>' guvcview/guvcview.c
diff --git a/video/guvcview/patches/0001-fix-building-with-musl-libc.patch 
b/video/guvcview/patches/0001-fix-building-with-musl-libc.patch
new file mode 100644
index 0000000..654f992
--- /dev/null
+++ b/video/guvcview/patches/0001-fix-building-with-musl-libc.patch
@@ -0,0 +1,120 @@
+From 3112f9654e9f21ce5d3ab23a3a1e7c6dfdce45c6 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa AT alpinelinux.org>
+Date: Mon, 25 May 2015 11:33:46 +0000
+Subject: [PATCH] fix building with musl libc
+
+The __BEGIN_DECLS and __END_DECLS are internal identifiers which are not
+defined in any standard. The use of those makes compile fail with musl
+libc so we avoid using them
+---
+ gview_audio/gviewaudio.h       | 9 +++++++--
+ gview_encoder/gviewencoder.h   | 8 ++++++--
+ gview_render/gviewrender.h     | 8 ++++++--
+ gview_v4l2core/gviewv4l2core.h | 8 ++++++--
+ 4 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/gview_audio/gviewaudio.h b/gview_audio/gviewaudio.h
+index 0cc6f70..5cae68b 100644
+--- a/gview_audio/gviewaudio.h
++++ b/gview_audio/gviewaudio.h
+@@ -38,7 +38,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef  __cplusplus
++extern "C" {
++#endif
+ 
+ /*Audio API*/
+ #define AUDIO_NONE          (0)
+@@ -263,6 +265,9 @@ int audio_stop(audio_context_t *audio_ctx);
+  */
+ void audio_close(audio_context_t *audio_ctx);
+ 
+-__END_DECLS
++
++#ifdef  __cplusplus
++}
++#endif
+ 
+ #endif
+diff --git a/gview_encoder/gviewencoder.h b/gview_encoder/gviewencoder.h
+index 2bc3586..aeff883 100644
+--- a/gview_encoder/gviewencoder.h
++++ b/gview_encoder/gviewencoder.h
+@@ -38,7 +38,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef  __cplusplus
++extern "C" {
++#endif
+ 
+ /*encoder modes*/
+ #define ENCODER_MODE_NONE   (0)
+@@ -732,6 +734,8 @@ int encoder_write_audio_data(encoder_context_t 
*encoder_ctx);
+  */
+ int encoder_disk_supervisor(int treshold, const char *path);
+ 
+-__END_DECLS
++#ifdef  __cplusplus
++}
++#endif
+ 
+ #endif
+diff --git a/gview_render/gviewrender.h b/gview_render/gviewrender.h
+index e6cedfa..73c3b2c 100644
+--- a/gview_render/gviewrender.h
++++ b/gview_render/gviewrender.h
+@@ -38,7 +38,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef  __cplusplus
++extern "C" {
++#endif
+ 
+ #define RENDER_NONE     (0)
+ #define RENDER_SDL      (1)
+@@ -279,6 +281,8 @@ void render_clean_fx();
+  */
+ void render_close();
+ 
+-__END_DECLS
++#ifdef  __cplusplus
++}
++#endif
+ 
+ #endif
+diff --git a/gview_v4l2core/gviewv4l2core.h b/gview_v4l2core/gviewv4l2core.h
+index e9d5d53..35f075f 100644
+--- a/gview_v4l2core/gviewv4l2core.h
++++ b/gview_v4l2core/gviewv4l2core.h
+@@ -33,7 +33,9 @@
+ #include <sys/types.h>
+ 
+ /*make sure we support c++*/
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /*
+  * LOGITECH Dynamic controls defs
+@@ -1386,7 +1388,9 @@ int v4l2core_save_image(v4l2_frame_buff_t *frame, 
const char *filename, int form
+  */
+ uint64_t v4l2core_time_get_timestamp();
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
+ 
+-- 
+2.4.1
+