Skip to content

Commit

Permalink
remove XMMS plugin code
Browse files Browse the repository at this point in the history 
15 years ago the XMMS plugin code was marked as "does not work,
let's keep it if anybody wants to fix it" but nothing ever happened.

XMMS has been succeeded by XMMS 2 (or even never versions) and won't
compile any more on current systems anyway (library changes etc.).

So remove it for good.
  • Loading branch information
@mmitch
mmitch committed Oct 12, 2023
1 parent 515e720 commit 836a1e5
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 837 deletions.
31 changes: 1 addition & 30 deletions INSTALL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,14 @@ gbsplay INSTALL instructions

### BASIC INSTRUCTIONS

Run "make". This should autoconfigure and build all files. If you
have GTK and XMMS development files installed, the XMMS library will
also be built.
Run "make". This should autoconfigure and build all files.

Run "make install" (as root) to install everything to your system.
Run "make uninstall" (as root) to remove it afterwards.

Be aware that you need a GNU make!
So on FreeBSD, you need to run "gmake" instead of "make".

If you want to build the XMMS plugin, you must have the XMMS
development files installed (header files etc.). If you have
installed XMMS but the configure script does not detect it, you
probably need to install an extra package named something like
"xmms-dev".

Note to Solaris users:
Solaris /bin/sh is not POSIX compatible (${foo#bar} and ${foo%bar} are
not supported), please change the first line of configure to from /bin/sh
Expand All @@ -36,24 +28,3 @@ $ make
$ make install

Remember to use the same prefix on uninstall!



### CUSTOMIZING THE XMMS PLUGIN PATH

Installing the XMMS plugin to another directory is a bit tricky :-)
Upon configure, the XMMS plugin target path is detected by running
`xmms-config --input-plugin-dir`. You can not change this path!
But you can prepend it with another path. Use XMMSPREFIX= for this.

Example:

$ ./configure --prefix=/tmp/GBSPLAY/usr
$ make
$ make install XMMSPREFIX=/tmp/GBSPLAY

This will install to /tmp/GBSPLAY/usr/(bin|man|share/doc) and put the
XMMS plugin to /tmp/GBSPLAY/$(xmms-config --input-plugin-dir).

This is probably what you want to do if you plan to
"install everything under /tmp/GBSPLAY".
24 changes: 0 additions & 24 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ endif
endif

TEST_WRAPPER =
XMMSPREFIX :=
DESTDIR :=

# Update paths with user-provided DESTDIR
Expand All @@ -66,8 +65,6 @@ appdir := $(DESTDIR)$(appdir)
includedir := $(DESTDIR)$(includedir)
pkgconfigdir := $(DESTDIR)$(pkgconfigdir)

xmmsdir := $(DESTDIR)$(XMMSPREFIX)$(XMMS_INPUT_PLUGIN_DIR)

man1dir := $(mandir)/man1
man3dir := $(mandir)/man3
man5dir := $(mandir)/man5
Expand Down Expand Up @@ -107,7 +104,6 @@ objs_libgbspic := gbcpu.lo gbhw.lo mapper.lo gbs.lo crc32.lo
objs_libgbs := gbcpu.o gbhw.o mapper.o gbs.o crc32.o
objs_gbs2gb := gbs2gb.o
objs_gbsinfo := gbsinfo.o
objs_gbsxmms := gbsxmms.lo
objs_gbsplay := gbsplay.o util.o plugout.o player.o cfgparser.o
objs_xgbsplay := xgbsplay.o util.o plugout.o player.o cfgparser.o
objs_test_gbs := test_gbs.o
Expand Down Expand Up @@ -278,10 +274,6 @@ objs_gbsplay += libgbs.a
objs_gbs2gb += libgbs.a
objs_gbsinfo += libgbs.a
objs_test_gbs += libgbs.a
ifeq ($(build_xmmsplugin),yes)
objs += $(objs_libgbspic)
objs_gbsxmms += libgbspic.a
endif # build_xmmsplugin
objs_xgbsplay += libgbs.a

libgbs: libgbs.a
Expand All @@ -294,11 +286,6 @@ endif # use_sharedlibs
objs += $(objs_gbsplay) $(ojbs_gbs2gb) $(objs_gbsinfo)
dsts += gbsplay gbs2gb gbsinfo

ifeq ($(build_xmmsplugin),yes)
objs += $(objs_gbsxmms)
dsts += gbsxmms.so
endif

ifeq ($(build_xgbsplay),yes)
objs += $(objs_xgbsplay)
dsts += xgbsplay
Expand Down Expand Up @@ -375,10 +362,6 @@ install-contrib:
install -d $(contribdir)
install -m 644 $(contribs) $(contribdir)

install-gbsxmms.so:
install -d $(xmmsdir)
install -m 644 gbsxmms.so $(xmmsdir)/gbsxmms.so

install-xgbsplay:
install -d $(bindir)
install -d $(man1dir)
Expand Down Expand Up @@ -429,10 +412,6 @@ uninstall-contrib:
rm -rf $(contribdir)
-rmdir -p $(contribdir)

uninstall-gbsxmms.so:
rm -f $(xmmsdir)/gbsxmms.so
-rmdir -p $(xmmsdir)

uninstall-xgbsplay:
rm -f $(bindir)/$(xgbsplaybin)
rm -f $(man1dir)/xgbsplay.1
Expand Down Expand Up @@ -581,9 +560,6 @@ gbsplay: $(objs_gbsplay) libgbs
test_gbs: $(objs_test_gbs) libgbs
$(BUILDCC) -o $(test_gbsbin) $(objs_test_gbs) $(GBSLDFLAGS)

gbsxmms.so: $(objs_gbsxmms) libgbspic gbsxmms.so.ver
$(BUILDCC) -shared -fpic -Wl,--version-script,$@.ver -o $@ $(objs_gbsxmms) $(GBSLDFLAGS) $(PTHREAD)

xgbsplay: $(objs_xgbsplay) libgbs
$(BUILDCC) -o $(xgbsplaybin) $(objs_xgbsplay) $(GBSLDFLAGS) $(XGBSPLAYLDFLAGS) -lm

Expand Down
29 changes: 7 additions & 22 deletions TESTSUITE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,15 @@ pass index content
[ ] 2.3.1 check german translation


*** 3 xmmsgbs
*** 3 build
[ ] 3.1 check build on i386
[ ] 3.2 check build on amd_64
[ ] 3.3 check build on Cygwin

3.1 player
[ ] 3.1.1 check playing
[ ] 3.1.2 check quit
[ ] 3.1.3 check pause
[ ] 3.1.4 check subsong changes

3.2 track info
[ ] 3.2.1 check display
[ ] 3.2.2 check next
[ ] 3.2.3 check prev
[ ] 3.2.4 check save


*** 4 build
[ ] 4.1 check build on i386
[ ] 4.2 check build on amd_64
[ ] 4.3 check build on Cygwin


*** 5 other
[ ] 5.1 check HISTORY
[ ] 5.2 check for git tag
*** 4 other
[ ] 4.1 check HISTORY
[ ] 4.2 check for git tag

---------------------------------------------------------------

Expand Down
88 changes: 0 additions & 88 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ EXTRA_INSTALL=
EXTRA_SRCS=
EXTRA_UNINSTALL=
EXTRA_I18NFLAGS=
XMMS_INPUT_PLUGIN_DIR=
CC="${CC-gcc}" # use gcc by default
CONFIGURE_FLAGS="${CONFIGURE_FLAGS- }"
CFLAGS="${CFLAGS-}"
Expand Down Expand Up @@ -531,7 +530,6 @@ Optional Features:
--enable-verbosebuild give verbose output during build
Optional Modules:
--with-xmmsplugin build XMMS input plugin
--with-xgbsplay build graphical frontend xgbsplay
--without-contrib don't install contrib scripts
--without-test don't test gbsplay output during build
Expand All @@ -556,7 +554,6 @@ EOF
OPTS=""
OPTS="${OPTS} build_contrib"
OPTS="${OPTS} build_test"
OPTS="${OPTS} build_xmmsplugin"
OPTS="${OPTS} build_xgbsplay"
OPTS="${OPTS} use_alsa"
OPTS="${OPTS} use_debug"
Expand Down Expand Up @@ -638,7 +635,6 @@ case "$BUILDOS" in
esac

## more defaults
setdefault build_xmmsplugin no
setdefault build_xgbsplay no
setdefault build_contrib yes
## disable test when cross-compiling
Expand Down Expand Up @@ -969,87 +965,6 @@ else
have_doxygen=no
fi

if [ "$build_xmmsplugin" != "no" ]; then
## check for pthread

PTHREAD=
check_include pthread.h
if [ "$have_pthread_h" = "yes" ]; then
cc_check "checking for Linux flavoured pthread" have_pthread "-lpthread" found no <<EOF
#include <pthread.h>
int main(int argc, char **argv)
{
pthread_self();
return 0;
}
EOF
if [ $? -eq 0 ]; then
PTHREAD="-lpthread"
else
cc_check "checking FreeBSD-flavoured pthread" have_pthread "-pthread" found no <<EOF
#include <pthread.h>
int main(int argc, char **argv)
{
pthread_self();
return 0;
}
EOF
if [ $? -eq 0 ]; then
PTHREAD="-pthread"
else
echo "no known pthread implementation found!"
fi
fi
fi

## check for glib development files

printf "checking for glib-dev: "
GLIB_CFLAGS=
if CONFIG=$(command -v glib-config); then
if GLIB_CFLAGS=$(glib-config --cflags); then
echo "ok"
else
echo "error running glib-config --cflags!"
fi
else
echo "glib-config not found!"
fi

## check for xmms development files

printf "checking for xmms-dev: "
XMMS_CFLAGS=
if CONFIG=$(command -v xmms-config); then
if XMMS_CFLAGS=$(xmms-config --cflags); then
if XMMS_INPUT_PLUGIN_DIR=$(xmms-config --input-plugin-dir); then
echo "ok"
else
echo "error running xmms-config --input-plugin-dir!"
fi
else
echo "error running xmms-config --cflags!"
fi
else
echo "xmms-config not found!"
fi
else
GLIB_CFLAGS=
XMMS_CFLAGS=
PTHREAD=
fi

## can XMMS be built?

if [ "$build_xmmsplugin" != "no" ] && [ "$GLIB_CFLAGS" ] && [ "$XMMS_CFLAGS" ] && [ "$XMMS_INPUT_PLUGIN_DIR" ] && [ "$PTHREAD" ]; then
append_nodupe CFLAGS $GLIB_CFLAGS $XMMS_CFLAGS
EXTRA_INSTALL="$EXTRA_INSTALL install-gbsxmms.so"
EXTRA_UNINSTALL="$EXTRA_UNINSTALL uninstall-gbsxmms.so"
build_xmmsplugin=yes
else
build_xmmsplugin=no
fi

## can xgbsplay be built?

if [ "$build_xgbsplay" != "no" ]; then
Expand Down Expand Up @@ -1255,8 +1170,6 @@ EXTRA_INSTALL
EXTRA_LDFLAGS
EXTRA_SRCS
EXTRA_UNINSTALL
PTHREAD
XMMS_INPUT_PLUGIN_DIR
VERSION
prefix
exec_prefix
Expand All @@ -1275,7 +1188,6 @@ BUILDCC
HOSTCC
build_contrib
build_test
build_xmmsplugin
build_xgbsplay
have_doxygen
have_xgettext
Expand Down
Loading

0 comments on commit 836a1e5

Please sign in to comment.