fix xine-ui compile

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

XOrg/app/xine-ui/Makefile

@@ -27,7 +27,9 @@ define Package/xine-ui
   DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libICE +libXxf86vm
 endef
 
-CONFIGURE_VARS+=PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -lnotimpl"
+CONFIGURE_VARS+= \
+	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+
 CONFIGURE_ARGS+=--without-aalib \
 			--without-libcaca \
 			--disable-lirc \
@@ -43,20 +45,21 @@ define Build/Configure
 			$(CONFIGURE_ARGS) ;\
 		fi \
 	)
+	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) X_LIBS="-L$(STAGING_DIR)/usr/lib -lnotimpl -lfreetype"
 	$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
 endef
 
-define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
 define Package/xine-ui/install
-	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/share/xine \
+		$(PKG_INSTALL_DIR)/usr/share/pixmaps \
+		$(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,xine-ui))

XOrg/app/xine-ui/patches/100-cflags.patch

@@ -0,0 +1,13 @@
+Index: xine-ui-0.99.4/configure
+===================================================================
+--- xine-ui-0.99.4.orig/configure	2007-12-23 01:23:31.650316801 +0100
++++ xine-ui-0.99.4/configure	2007-12-23 01:23:42.194917702 +0100
+@@ -31351,7 +31351,7 @@
+ SYSCONF_DIR=`eval echo "$sysconfdir"`
+ 
+ 
+-INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit -I$(prefix)/include $(INTLDIR)'
++INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/common -I$(top_builddir)/src/common -I$(top_srcdir)/src/xitk/xine-toolkit -I$(top_builddir)/src/xitk/xine-toolkit $(INTLDIR)'
+ 
+ 
+ 

XOrg/app/xine-ui/patches/110-xitk.patch

@@ -0,0 +1,16 @@
+Index: xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c
+===================================================================
+--- xine-ui-0.99.4.orig/src/xitk/xine-toolkit/xitk.c	2007-12-23 01:26:05.991112183 +0100
++++ xine-ui-0.99.4/src/xitk/xine-toolkit/xitk.c	2007-12-23 01:26:10.819387329 +0100
+@@ -45,11 +45,6 @@
+ #include <sys/time.h>
+ 
+ #include <locale.h>
+-
+-#ifdef __linux__
+-#include <execinfo.h>
+-#endif
+-
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ #include <X11/keysym.h>