From edfd8020a32d00ea60a45fc906235c3c44b7d869 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 6 Feb 2023 02:10:16 +0100 Subject: [PATCH 1/2] Plugins (mplayer): Resolve use of mremap for Clang on macOS Same error on all of macOS 10.15, macOS 11, macOS 12: > libtool: compile: clang -DHAVE_CONFIG_H -I. -I../../../../libvisual-plugins-0.4.1/plugins/input/mplayer -I../../.. -I../../../../libvisual-plugins-0.4.1 -I/Users/runner/.local/include/libvisual-0.4 -g -O2 -DUNIX_X -D_REENTRANT -MT input_mplayer.lo -MD -MP -MF .deps/input_mplayer.Tpo -c ../../../../libvisual-plugins-0.4.1/plugins/input/mplayer/input_mplayer.c -fno-common -DPIC -o .libs/input_mplayer.o > ../../../../libvisual-plugins-0.4.1/plugins/input/mplayer/input_mplayer.c:183:20: error: implicit declaration of function 'mremap' is invalid in C99 [-Werror,-Wimplicit-function-declaration] > priv->mmap_area = mremap( priv->mmap_area, sizeof( mplayer_data_t ), > ^ > ../../../../libvisual-plugins-0.4.1/plugins/input/mplayer/input_mplayer.c:183:18: warning: incompatible integer to pointer conversion assigning to 'mplayer_data_t *' from 'int' [-Wint-conversion] > priv->mmap_area = mremap( priv->mmap_area, sizeof( mplayer_data_t ), > ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- .../plugins/input/mplayer/input_mplayer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libvisual-plugins/plugins/input/mplayer/input_mplayer.c b/libvisual-plugins/plugins/input/mplayer/input_mplayer.c index a0fea1b14..123c78070 100644 --- a/libvisual-plugins/plugins/input/mplayer/input_mplayer.c +++ b/libvisual-plugins/plugins/input/mplayer/input_mplayer.c @@ -22,8 +22,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE /* for function mremap */ - #include #include @@ -180,9 +178,11 @@ int inp_mplayer_init( VisPluginData *plugin ) return -6; } - priv->mmap_area = mremap( priv->mmap_area, sizeof( mplayer_data_t ), - sizeof( mplayer_data_t ) + priv->mmap_area->bs, - 0 ); + const int buffer_size = priv->mmap_area->bs; + munmap( priv->mmap_area, sizeof( mplayer_data_t ) ); + + priv->mmap_area = mmap( 0, sizeof( mplayer_data_t ) + buffer_size, + PROT_READ, MAP_SHARED, priv->fd, 0 ); if ( priv->mmap_area == (void *)-1 ) { visual_log( VISUAL_LOG_CRITICAL, From 925f8aa6d75563d924dc9ec7b16f941c82993ba7 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 13 Feb 2023 19:22:06 +0100 Subject: [PATCH 2/2] Plugins: Sync translations --- libvisual-plugins/po/de.po | 12 ++++++------ libvisual-plugins/po/es_AR.po | 12 ++++++------ libvisual-plugins/po/es_ES.po | 12 ++++++------ libvisual-plugins/po/libvisual-plugins-0.4.pot | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libvisual-plugins/po/de.po b/libvisual-plugins/po/de.po index f40199df8..b67161da1 100644 --- a/libvisual-plugins/po/de.po +++ b/libvisual-plugins/po/de.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: libvisual-plugins 0.4.0\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-21 03:37+0100\n" +"POT-Creation-Date: 2023-02-14 16:26+0100\n" "PO-Revision-Date: 2017-11-23 18:08:07+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -470,26 +470,26 @@ msgstr "Eingabeschnittstellen konnten nicht verbunden werden." msgid "The jack server seems to have shutdown" msgstr "Der Jack-Server scheint heruntergefahren zu sein." -#: plugins/input/mplayer/input_mplayer.c:98 +#: plugins/input/mplayer/input_mplayer.c:96 msgid "Use data exported from MPlayer" msgstr "Vom Mplayer exportierte Daten werden benutzt." -#: plugins/input/mplayer/input_mplayer.c:99 +#: plugins/input/mplayer/input_mplayer.c:97 msgid "This plugin uses data exported from 'mplayer -af export'" msgstr "" "Diese Erweiterung verwendet per »mplayer -af export« exportierte Daten." -#: plugins/input/mplayer/input_mplayer.c:155 +#: plugins/input/mplayer/input_mplayer.c:153 #, c-format msgid "Could not open file '%s': %s" msgstr "Datei »%s« kann nicht geöffnet werden: %s" -#: plugins/input/mplayer/input_mplayer.c:166 +#: plugins/input/mplayer/input_mplayer.c:164 msgid "No audio channel available" msgstr "kein Audiokanal verfügbar" # https://de.wikipedia.org/wiki/Sampling_(Musik)#Audiosample -#: plugins/input/mplayer/input_mplayer.c:174 +#: plugins/input/mplayer/input_mplayer.c:172 #, c-format msgid "" "Data in wrong format. It should be 2 channels with 512 16bit samples. There " diff --git a/libvisual-plugins/po/es_AR.po b/libvisual-plugins/po/es_AR.po index 67dd72d13..e3a2a0cba 100644 --- a/libvisual-plugins/po/es_AR.po +++ b/libvisual-plugins/po/es_AR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Libvisual plugins 0.3.0\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-21 03:37+0100\n" +"POT-Creation-Date: 2023-02-14 16:26+0100\n" "PO-Revision-Date: 2005-03-16 00:11-0300\n" "Last-Translator: Duilio Javier Protti \n" "Language-Team: Spanish \n" @@ -456,24 +456,24 @@ msgstr "No se puede conectar los puertos de entrada" msgid "The jack server seems to have shutdown" msgstr "El servidor jack parece haberse caído" -#: plugins/input/mplayer/input_mplayer.c:98 +#: plugins/input/mplayer/input_mplayer.c:96 msgid "Use data exported from MPlayer" msgstr "Usa datos exportados desde MPlayer" -#: plugins/input/mplayer/input_mplayer.c:99 +#: plugins/input/mplayer/input_mplayer.c:97 msgid "This plugin uses data exported from 'mplayer -af export'" msgstr "Este plugin usa datos exportados desde 'mplayer -af export'" -#: plugins/input/mplayer/input_mplayer.c:155 +#: plugins/input/mplayer/input_mplayer.c:153 #, c-format msgid "Could not open file '%s': %s" msgstr "No se puede abrir el archivo '%s': %s" -#: plugins/input/mplayer/input_mplayer.c:166 +#: plugins/input/mplayer/input_mplayer.c:164 msgid "No audio channel available" msgstr "No hay canal de audio disponible" -#: plugins/input/mplayer/input_mplayer.c:174 +#: plugins/input/mplayer/input_mplayer.c:172 #, c-format msgid "" "Data in wrong format. It should be 2 channels with 512 16bit samples. There " diff --git a/libvisual-plugins/po/es_ES.po b/libvisual-plugins/po/es_ES.po index 2f195e35c..77526d93a 100644 --- a/libvisual-plugins/po/es_ES.po +++ b/libvisual-plugins/po/es_ES.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Libvisual plugins 0.3.0\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-21 03:37+0100\n" +"POT-Creation-Date: 2023-02-14 16:26+0100\n" "PO-Revision-Date: 2005-03-16 00:11-0300\n" "Last-Translator: Duilio Javier Protti \n" "Language-Team: Spanish \n" @@ -456,24 +456,24 @@ msgstr "No se puede conectar los puertos de entrada" msgid "The jack server seems to have shutdown" msgstr "El servidor jack parece haberse caído" -#: plugins/input/mplayer/input_mplayer.c:98 +#: plugins/input/mplayer/input_mplayer.c:96 msgid "Use data exported from MPlayer" msgstr "Usa datos exportados desde MPlayer" -#: plugins/input/mplayer/input_mplayer.c:99 +#: plugins/input/mplayer/input_mplayer.c:97 msgid "This plugin uses data exported from 'mplayer -af export'" msgstr "Este plugin usa datos exportados desde 'mplayer -af export'" -#: plugins/input/mplayer/input_mplayer.c:155 +#: plugins/input/mplayer/input_mplayer.c:153 #, c-format msgid "Could not open file '%s': %s" msgstr "No se puede abrir el archivo '%s': %s" -#: plugins/input/mplayer/input_mplayer.c:166 +#: plugins/input/mplayer/input_mplayer.c:164 msgid "No audio channel available" msgstr "No hay canal de audio disponible" -#: plugins/input/mplayer/input_mplayer.c:174 +#: plugins/input/mplayer/input_mplayer.c:172 #, c-format msgid "" "Data in wrong format. It should be 2 channels with 512 16bit samples. There " diff --git a/libvisual-plugins/po/libvisual-plugins-0.4.pot b/libvisual-plugins/po/libvisual-plugins-0.4.pot index e796cdf90..cab911089 100644 --- a/libvisual-plugins/po/libvisual-plugins-0.4.pot +++ b/libvisual-plugins/po/libvisual-plugins-0.4.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libvisual-plugins 0.4.1\n" "Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n" -"POT-Creation-Date: 2023-01-21 03:37+0100\n" +"POT-Creation-Date: 2023-02-14 16:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -434,24 +434,24 @@ msgstr "" msgid "The jack server seems to have shutdown" msgstr "" -#: plugins/input/mplayer/input_mplayer.c:98 +#: plugins/input/mplayer/input_mplayer.c:96 msgid "Use data exported from MPlayer" msgstr "" -#: plugins/input/mplayer/input_mplayer.c:99 +#: plugins/input/mplayer/input_mplayer.c:97 msgid "This plugin uses data exported from 'mplayer -af export'" msgstr "" -#: plugins/input/mplayer/input_mplayer.c:155 +#: plugins/input/mplayer/input_mplayer.c:153 #, c-format msgid "Could not open file '%s': %s" msgstr "" -#: plugins/input/mplayer/input_mplayer.c:166 +#: plugins/input/mplayer/input_mplayer.c:164 msgid "No audio channel available" msgstr "" -#: plugins/input/mplayer/input_mplayer.c:174 +#: plugins/input/mplayer/input_mplayer.c:172 #, c-format msgid "" "Data in wrong format. It should be 2 channels with 512 16bit samples. There "