Commit 8886dbfa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

GME: complete plugin removal

This uses some unspecified C++ statically linked version of GME.
That does not correspond to libgme, and seems unused.
(cherry picked from commit 9728d81b27280fcf1f5242de88cab9e7ab62ac27)

Conflicts:

	modules/demux/gme.cpp
	po/POTFILES.in
parent d33ad533
...@@ -913,7 +913,7 @@ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) ...@@ -913,7 +913,7 @@ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
if test "${have_zlib}" = "yes" if test "${have_zlib}" = "yes"
then then
VLC_ADD_LIBS([access_http gme mp4 skins2 sap mkv unzip zip],[-lz]) VLC_ADD_LIBS([access_http mp4 skins2 sap mkv unzip zip],[-lz])
PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
AC_CHECK_HEADERS([unzip.h], [ AC_CHECK_HEADERS([unzip.h], [
have_minizip=yes have_minizip=yes
...@@ -2512,44 +2512,6 @@ then ...@@ -2512,44 +2512,6 @@ then
VLC_ADD_LIBS([mpc],[-lmpcdec])])]) VLC_ADD_LIBS([mpc],[-lmpcdec])])])
fi fi
dnl
dnl game music emu demux plugin
dnl
AC_ARG_ENABLE(gme,
[ --enable-gme Game Music Emu demux support (default enabled)])
if test "${enable_gme}" != "no" -a "${CXX}" != "";
then
AC_LANG_PUSH(C++)
AC_ARG_WITH(gme-tree,
[ --with-gme-tree=PATH gme tree for static linking])
if test -n "${with_gme_tree}"
then
AC_MSG_CHECKING(for libgme.a in ${with_mod_tree})
real_gme_tree="`cd ${with_gme_tree} 2>/dev/null && pwd`"
if test -z "${real_gme_tree}"
then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_gme_tree}])
fi
if test -f "${real_gme_tree}/gme/libgme.a"
then
dnl Use a custom gme
AC_MSG_RESULT(${real_gme_tree}/gme/libgme.a)
VLC_ADD_PLUGIN([gme])
VLC_ADD_LIBS([gme],[${real_gme_tree}/gme/libgme.a])
VLC_ADD_CXXFLAGS([gme],[-I${real_gme_tree}/gme])
else
dnl The given gme wasn't built
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find ${real_mod_tree}/gme/libgme.a, make sure you compiled gme in ${with_gme_tree}])
fi
else
AC_MSG_WARN([only static linking is available, you must provide a gme-tree])
fi
AC_LANG_POP(C++)
fi
dnl dnl
dnl Codec plugins dnl Codec plugins
dnl dnl
......
...@@ -125,7 +125,6 @@ $Id$ ...@@ -125,7 +125,6 @@ $Id$
* ggi: video output module using the GGI API * ggi: video output module using the GGI API
* globalhotkeys: module to catch hotkeys when application doesn't have the focus * globalhotkeys: module to catch hotkeys when application doesn't have the focus
* glwin32: a opengl provider using DirectX OpenGL * glwin32: a opengl provider using DirectX OpenGL
* gme: game music files demuxer
* gnutls: GNU TLS encryption/decryption module * gnutls: GNU TLS encryption/decryption module
* goom: visualisation plugin based on goom * goom: visualisation plugin based on goom
* gradient: Gradient and edge detection video effects filter * gradient: Gradient and edge detection video effects filter
......
...@@ -25,7 +25,6 @@ SOURCES_xa = xa.c ...@@ -25,7 +25,6 @@ SOURCES_xa = xa.c
SOURCES_nuv = nuv.c SOURCES_nuv = nuv.c
SOURCES_nsc = nsc.c SOURCES_nsc = nsc.c
SOURCES_mpc = mpc.c SOURCES_mpc = mpc.c
SOURCES_gme = gme.cpp
SOURCES_tta = tta.c SOURCES_tta = tta.c
SOURCES_vc1 = vc1.c SOURCES_vc1 = vc1.c
SOURCES_demux_cdg = cdg.c SOURCES_demux_cdg = cdg.c
......
This diff is collapsed.
...@@ -451,7 +451,6 @@ modules/demux/cdg.c ...@@ -451,7 +451,6 @@ modules/demux/cdg.c
modules/demux/demuxdump.c modules/demux/demuxdump.c
modules/demux/dirac.c modules/demux/dirac.c
modules/demux/flac.c modules/demux/flac.c
modules/demux/gme.cpp
modules/demux/kate_categories.c modules/demux/kate_categories.c
modules/demux/live555.cpp modules/demux/live555.cpp
modules/demux/mjpeg.c modules/demux/mjpeg.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment