added xmms

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9170 3c298f89-4303-0410-b956-a3cf2f4a3e73

XOrg/app/xmms/Makefile

@@ -0,0 +1,61 @@
+# 
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# blogic@openwrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xmms
+PKG_VERSION:=1.2.10
+PKG_RELEASE:=1
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.xmms.org/files/1.2.x/
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xmms
+  SECTION:=xorg-app
+  CATEGORY:=Xorg
+  SUBMENU:=app
+  DEPENDS:=+xorg-server-essentials +alsa-lib +gtk-1.2.10 +libnotimpl
+  TITLE:=XMMS audio player
+endef
+
+define Package/xmms/description
+	Popular music player for X
+endef
+
+CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl" \
+	sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+	sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+	--disable-mikmod \
+	--disable-vorbis
+
+define Build/Configure
+	(cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
+		if [ -x $(CONFIGURE_CMD) ]; then \
+			$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+			$(TARGET_CONFIGURE_OPTS) \
+			$(CONFIGURE_VARS) \
+			$(CONFIGURE_CMD) \
+			$(CONFIGURE_ARGS_XTRA) \
+			$(CONFIGURE_ARGS) ;\
+		fi \
+	)
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) 
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install 
+endef
+
+define Package/xmms/install
+	$(INSTALL_DIR) $(1)/usr/{bin,share/xmms}
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xmms $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/xmms/* $(1)/usr/share/xmms/
+endef
+
+$(eval $(call BuildPackage,xmms))

XOrg/app/xmms/patches/glibfool.patch

@@ -0,0 +1,54 @@
+diff -urN xmms-1.2.10.orig/libxmms/Makefile.in xmms-1.2.10/libxmms/Makefile.in
+--- xmms-1.2.10.orig/libxmms/Makefile.in	2007-10-06 04:12:42.000000000 +0200
++++ xmms-1.2.10/libxmms/Makefile.in	2007-10-06 04:13:52.000000000 +0200
+@@ -255,6 +255,9 @@
+ 	done
+ libxmms.la: $(libxmms_la_OBJECTS) $(libxmms_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libxmms_la_LDFLAGS) $(libxmms_la_OBJECTS) $(libxmms_la_LIBADD) $(LIBS)
++	$(CCLD) -shared  configfile.lo xmmsctrl.lo dirbrowser.lo util.lo formatter.lo titlestring.lo xentry.lo xconvert.lo \
++		-Wl,--whole-archive -Wl,--no-whole-archive ${libxmms_la_LIBADD} \
++		-lm  -Wl,-rpath-link=/usr/src/owrt-X2/staging_dir/i686/usr/lib -Wl,-soname -Wl,libxmms.so.1 -o .libs/libxmms.so.1.3.1
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+diff -urN xmms-1.2.10.orig/xmms/Makefile.in xmms-1.2.10/xmms/Makefile.in
+--- xmms-1.2.10.orig/xmms/Makefile.in	2007-10-06 04:12:42.000000000 +0200
++++ xmms-1.2.10/xmms/Makefile.in	2007-10-06 04:16:44.000000000 +0200
+@@ -226,7 +226,7 @@
+ 
+ xmms_LDFLAGS = -export-dynamic
+ xmms_LDADD = @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
+-@POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
++@POSIX_LIBS@ -L../libxmms/.libs/ -lxmms @LTLIBINTL@
+ 
+ 
+ INCLUDES = @GTK_CFLAGS@ @XMMS_DEFINES@ @ARCH_DEFINES@ \
+@@ -341,7 +341,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(xmms_SOURCES)
+ HEADERS = $(xmmsinclude_HEADERS)
+--- xmms-1.2.10.orig/wmxmms/Makefile.in	2007-10-06 04:12:42.000000000 +0200
++++ xmms-1.2.10/wmxmms/Makefile.in	2007-10-06 04:24:28.000000000 +0200
+@@ -220,7 +220,7 @@
+ xmmsdir = @xmmsdir@
+ bin_PROGRAMS = wmxmms
+ 
+-wmxmms_LDADD = @GTK_LIBS@ $(top_builddir)/libxmms/libxmms.la @LTLIBINTL@
++wmxmms_LDADD = @GTK_LIBS@ -L../libxmms/.libs/ -lxmms @LTLIBINTL@
+ 
+ wmxmms_SOURCES = \
+ getopt.c \
+@@ -259,7 +259,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS)  \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(wmxmms_SOURCES)
+ DATA = $(wmxmms_DATA)

XOrg/app/xmms/patches/xmms-1.2.10-gcc4-1.patch

@@ -0,0 +1,36 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-21
+Initial Package Version: 1.2.10
+Upstream Status:         Submitted to XMMS Bugzilla
+Origin:                  Con Kolivas (submitted to XMMS Bugzilla)
+                         http://bugs.xmms.org/show_bug.cgi?id=2225
+Description:             Fixes build issue when using GCC-4
+
+
+Index: xmms-1.2.10/General/ir/ir.h
+===================================================================
+--- xmms-1.2.10.orig/General/ir/ir.h	2001-03-06 00:17:44.000000000 +1100
++++ xmms-1.2.10/General/ir/ir.h	2005-08-07 18:07:23.000000000 +1000
+@@ -49,8 +49,6 @@ typedef struct
+ }
+ irConfig;
+ 
+-extern pthread_t irapp_thread;
+-extern gboolean keepGoing;
+ extern irConfig ircfg;
+ extern gboolean irconf_is_going;
+ 
+
+Index: xmms-1.2.10/Output/esd/esdout.h
+===================================================================
+--- xmms-1.2.10.orig/Output/esd/esdout.h	2001-12-03 13:38:42.000000000 +1100
++++ xmms-1.2.10/Output/esd/esdout.h	2005-08-07 17:59:45.000000000 +1000
+@@ -58,6 +58,7 @@ typedef struct
+ ESDConfig;
+ 
+ extern ESDConfig esd_cfg;
++extern void esdout_reset_playerid(void);
+ 
+ void esdout_init(void);
+ void esdout_about(void);
+

XOrg/app/xmms/pathes

@@ -0,0 +1,33 @@
+--- xmms-1.2.10.orig/libxmms/Makefile	2007-10-06 03:35:15.000000000 +0200
++++ xmms-1.2.10/libxmms/Makefile	2007-10-06 04:05:21.000000000 +0200
+@@ -255,6 +255,9 @@
+ 	done
+ libxmms.la: $(libxmms_la_OBJECTS) $(libxmms_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libxmms_la_LDFLAGS) $(libxmms_la_OBJECTS) $(libxmms_la_LIBADD) $(LIBS)
++	$(CCLD) -shared  configfile.lo xmmsctrl.lo dirbrowser.lo util.lo formatter.lo titlestring.lo xentry.lo xconvert.lo \
++	        -Wl,--whole-archive -Wl,--no-whole-archive ${libxmms_la_LIBADD} \
++	        -lm  -Wl,-rpath-link=/usr/src/owrt-X2/staging_dir/i686/usr/lib -Wl,-soname -Wl,libxmms.so.1 -o .libs/libxmms.so.1.3.1
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+--- xmms-1.2.10.orig/xmms/Makefile	2007-10-06 03:35:14.000000000 +0200
++++ xmms-1.2.10/xmms/Makefile	2007-10-06 03:42:14.000000000 +0200
+@@ -225,8 +225,7 @@
+ bin_PROGRAMS = xmms
+ 
+ xmms_LDFLAGS = -export-dynamic
+-xmms_LDADD = -L/usr/src/owrt-X2/staging_dir/i686/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXext -lX11 -lm -lpthread -lSM -lICE -lXxf86vm \
+- $(top_builddir)/libxmms/libxmms.la 
++xmms_LDADD = -L../libxmms/.libs/ -L/usr/src/owrt-X2/staging_dir/i686/usr/lib -lgtk -lgdk -rdynamic -lgmodule -lgthread -lglib -lpthread -ldl -lXext -lX11 -lm -lpthread -lSM -lICE -lXxf86vm -lxmms 
+ 
+ 
+ INCLUDES = -I/usr/include/gtk-1.2 -I/usr/src/owrt-X2/staging_dir/i686/usr/include/glib-1.2 -I/usr/src/owrt-X2/staging_dir/i686/usr/lib/glib/include -D_REENTRANT -I/usr/src/owrt-X2/staging_dir/i686/usr/include/ -Os -pipe -funit-at-a-time -fhonour-copts  -Wall -Wpointer-arith -finline-functions -fomit-frame-pointer -ffast-math -funroll-all-loops -DDATA_DIR=\"/usr/share/xmms\" -DPLUGIN_DIR=\"${exec_prefix}/lib/xmms\" -DPLUGINSUBS=\"Output\",\"Input\",\"Effect\",\"General\",\"Visualization\" -DLOCALEDIR=\"/usr/share/locale\" -DI386_ASSEM \
+@@ -341,7 +340,7 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(xmms_SOURCES)
+ HEADERS = $(xmmsinclude_HEADERS)