From 56220f86120b3d7b7d8c7b2957befede19f669b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 21 Mar 2015 14:15:22 +0200 Subject: [PATCH] vlc_plugin: fix non-LGPL plugins meta infos --- include/vlc_plugin.h | 6 ++++++ modules/access/dshow/dshow.cpp | 1 + modules/access/rtsp/access.c | 1 + modules/audio_filter/channel_mixer/dolby.c | 1 + modules/audio_filter/channel_mixer/headphone.c | 1 + modules/audio_filter/channel_mixer/mono.c | 1 + modules/audio_filter/converter/dtstospdif.c | 1 + modules/codec/dts.c | 1 + modules/codec/t140.c | 1 + modules/codec/x264.c | 1 + modules/codec/x265.c | 1 + modules/control/dbus/dbus.c | 1 + modules/control/dummy.c | 1 + modules/control/gestures.c | 1 + modules/control/globalhotkeys/win32.c | 1 + modules/control/globalhotkeys/xcb.c | 1 + modules/control/hotkeys.c | 1 + modules/control/lirc.c | 1 + modules/control/motion.c | 1 + modules/control/netsync.c | 1 + modules/control/ntservice.c | 1 + modules/control/rc.c | 1 + modules/control/win_msg.c | 1 + modules/demux/mpc.c | 1 + modules/demux/real.c | 1 + modules/gui/macosx/macosx.m | 1 + modules/gui/ncurses.c | 1 + modules/gui/skins2/src/skin_main.cpp | 1 + modules/logger/file.c | 1 + modules/logger/syslog.c | 1 + modules/misc/audioscrobbler.c | 1 + modules/misc/logger.c | 1 + modules/misc/playlist/export.c | 1 + modules/misc/rtsp.c | 1 + modules/misc/stats.c | 1 + modules/notify/growl.m | 1 + modules/notify/notify.c | 1 + modules/services_discovery/bonjour.c | 1 + modules/services_discovery/mediadirs.c | 1 + modules/services_discovery/mtp.c | 1 + modules/services_discovery/podcast.c | 1 + modules/services_discovery/sap.c | 1 + modules/stream_out/cycle.c | 1 + modules/stream_out/rtp.c | 1 + modules/video_filter/rotate.c | 1 + 45 files changed, 50 insertions(+) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 2fba949f36..8d272849a0 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -521,6 +521,12 @@ VLC_METADATA_EXPORTS "\x61\x6c\x20\x50\x75\x62\x6c\x69\x63\x20\x4c\x69\x63\x65\x6e\x73" \ "\x65\x2c\x20\x76\x65\x72\x73\x69\x6f\x6e\x20\x32\x2e\x31\x20\x6f" \ "\x72\x20\x6c\x61\x74\x65\x72\x2e" +#define VLC_LICENSE_GPL_2_PLUS \ + "\x4c\x69\x63\x65\x6e\x73\x65\x64\x20\x75\x6e\x64\x65\x72\x20\x74" \ + "\x68\x65\x20\x74\x65\x72\x6d\x73\x20\x6f\x66\x20\x74\x68\x65\x20" \ + "\x47\x4e\x55\x20\x47\x65\x6e\x65\x72\x61\x6c\x20\x50\x75\x62\x6c" \ + "\x69\x63\x20\x4c\x69\x63\x65\x6e\x73\x65\x2c\x20\x76\x65\x72\x73" \ + "\x69\x6f\x6e\x20\x32\x20\x6f\x72\x20\x6c\x61\x74\x65\x72\x2e" #if defined (__LIBVLC__) # define VLC_MODULE_COPYRIGHT VLC_COPYRIGHT_VIDEOLAN # ifndef VLC_MODULE_LICENSE diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index cbb4fe6c51..ac98a8fd85 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -38,6 +38,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c index dd786bec42..3a05be833a 100644 --- a/modules/access/rtsp/access.c +++ b/modules/access/rtsp/access.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c index 60819f6a3d..344d961cc7 100644 --- a/modules/audio_filter/channel_mixer/dolby.c +++ b/modules/audio_filter/channel_mixer/dolby.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c index 43c6032730..306264d603 100644 --- a/modules/audio_filter/channel_mixer/headphone.c +++ b/modules/audio_filter/channel_mixer/headphone.c @@ -32,6 +32,7 @@ #include /* sqrt */ +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c index 0bb71ccd33..3dc29929c7 100644 --- a/modules/audio_filter/channel_mixer/mono.c +++ b/modules/audio_filter/channel_mixer/mono.c @@ -31,6 +31,7 @@ #include /* sqrt */ #include /* int16_t .. */ +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c index 88384c8e23..99c57bdd2c 100644 --- a/modules/audio_filter/converter/dtstospdif.c +++ b/modules/audio_filter/converter/dtstospdif.c @@ -33,6 +33,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include diff --git a/modules/codec/dts.c b/modules/codec/dts.c index 5d777d4f01..991412c679 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -31,6 +31,7 @@ #endif #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/codec/t140.c b/modules/codec/t140.c index babbd47d44..feba0fe84d 100644 --- a/modules/codec/t140.c +++ b/modules/codec/t140.c @@ -23,6 +23,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/codec/x264.c b/modules/codec/x264.c index cb574a49fa..68df693b7a 100644 --- a/modules/codec/x264.c +++ b/modules/codec/x264.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/codec/x265.c b/modules/codec/x265.c index ff28059ad0..2fac637878 100644 --- a/modules/codec/x265.c +++ b/modules/codec/x265.c @@ -27,6 +27,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c index 62ec1705e7..0950548d3e 100644 --- a/modules/control/dbus/dbus.c +++ b/modules/control/dbus/dbus.c @@ -53,6 +53,7 @@ #include "dbus_tracklist.h" #include "dbus_introspect.h" +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/dummy.c b/modules/control/dummy.c index e541698c5a..9c93727a15 100644 --- a/modules/control/dummy.c +++ b/modules/control/dummy.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/gestures.c b/modules/control/gestures.c index a2fe30bfd1..c53202d8d5 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/globalhotkeys/win32.c b/modules/control/globalhotkeys/win32.c index f80510ed82..a4508f6e25 100644 --- a/modules/control/globalhotkeys/win32.c +++ b/modules/control/globalhotkeys/win32.c @@ -26,6 +26,7 @@ #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c index c6a43de7ba..98dc58b0fa 100644 --- a/modules/control/globalhotkeys/xcb.c +++ b/modules/control/globalhotkeys/xcb.c @@ -23,6 +23,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 77843a3c7b..49b9c4d8b1 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -30,6 +30,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/lirc.c b/modules/control/lirc.c index 9484107139..52c1dfe60b 100644 --- a/modules/control/lirc.c +++ b/modules/control/lirc.c @@ -32,6 +32,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/motion.c b/modules/control/motion.c index c2774203bd..6c2144b5c9 100644 --- a/modules/control/motion.c +++ b/modules/control/motion.c @@ -33,6 +33,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/netsync.c b/modules/control/netsync.c index 05b18b291f..1226e2cbab 100644 --- a/modules/control/netsync.c +++ b/modules/control/netsync.c @@ -30,6 +30,7 @@ #endif #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c index 3eda3ecdc2..bef0671572 100644 --- a/modules/control/ntservice.c +++ b/modules/control/ntservice.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/rc.c b/modules/control/rc.c index efa1893f00..bd3417a199 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -35,6 +35,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c index 32c890c055..aa18423bdb 100644 --- a/modules/control/win_msg.c +++ b/modules/control/win_msg.c @@ -25,6 +25,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c index a3b657a453..65dc57c6b8 100644 --- a/modules/demux/mpc.c +++ b/modules/demux/mpc.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/demux/real.c b/modules/demux/real.c index fa3219867c..0fa8cd7755 100644 --- a/modules/demux/real.c +++ b/modules/demux/real.c @@ -51,6 +51,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index b786760251..1c73e960ec 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -31,6 +31,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index a5e786c33e..6de779b5f4 100644 --- a/modules/gui/ncurses.c +++ b/modules/gui/ncurses.c @@ -42,6 +42,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 1739b31d38..2fbf3ba9d8 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -26,6 +26,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/logger/file.c b/modules/logger/file.c index df6d202be8..e95790a37b 100644 --- a/modules/logger/file.c +++ b/modules/logger/file.c @@ -25,6 +25,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/logger/syslog.c b/modules/logger/syslog.c index d88ecb4799..349e2576d6 100644 --- a/modules/logger/syslog.c +++ b/modules/logger/syslog.c @@ -23,6 +23,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index a7e622a250..81e2a8b66d 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -39,6 +39,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/misc/logger.c b/modules/misc/logger.c index 15e230954d..94b0c60b80 100644 --- a/modules/misc/logger.c +++ b/modules/misc/logger.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c index a42ef39358..2aa57f0b7a 100644 --- a/modules/misc/playlist/export.c +++ b/modules/misc/playlist/export.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c index 434c76e2f9..6dc8119def 100644 --- a/modules/misc/rtsp.c +++ b/modules/misc/rtsp.c @@ -30,6 +30,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/misc/stats.c b/modules/misc/stats.c index c98932780d..c2cb2e6fd7 100644 --- a/modules/misc/stats.c +++ b/modules/misc/stats.c @@ -33,6 +33,7 @@ #define kBufferSize 0x500 +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/notify/growl.m b/modules/notify/growl.m index e901e3dbe9..1eac19d311 100644 --- a/modules/notify/growl.m +++ b/modules/notify/growl.m @@ -54,6 +54,7 @@ #import #import +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/notify/notify.c b/modules/notify/notify.c index 2c4dfc99c5..f4d99db171 100644 --- a/modules/notify/notify.c +++ b/modules/notify/notify.c @@ -28,6 +28,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c index e118ab260c..bc234b458f 100644 --- a/modules/services_discovery/bonjour.c +++ b/modules/services_discovery/bonjour.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c index 0e081e986a..0d1c262f0c 100644 --- a/modules/services_discovery/mediadirs.c +++ b/modules/services_discovery/mediadirs.c @@ -31,6 +31,7 @@ #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c index a0e4ed5105..8a66a9e48e 100644 --- a/modules/services_discovery/mtp.c +++ b/modules/services_discovery/mtp.c @@ -24,6 +24,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 58089ac0e1..86663ae411 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -29,6 +29,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index abdf9575bd..392d213671 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -30,6 +30,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/stream_out/cycle.c b/modules/stream_out/cycle.c index 9678bc5591..8465659d9b 100644 --- a/modules/stream_out/cycle.c +++ b/modules/stream_out/cycle.c @@ -30,6 +30,7 @@ #include #include +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index 6a701242f2..7a03ba0ce0 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -30,6 +30,7 @@ # include "config.h" #endif +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index f5b729c1ca..69190c11b1 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -31,6 +31,7 @@ #include /* sin(), cos() */ +#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS #include #include #include -- 2.39.2