org.handhelds.familiar/packages/xmms-embedded/xmms-embedded-20040327/glib2.patch

   1 diff -urN xmms-embedded.orig/xmms/General/QPEgui/QPEgui.pro xmms-embedded/xmms/General/QPEgui/QPEgui.pro
   2 --- xmms-embedded.orig/xmms/General/QPEgui/QPEgui.pro   2003-04-01 12:55:53.000000000 -0500
   3 +++ xmms-embedded/xmms/General/QPEgui/QPEgui.pro        2004-03-28 19:04:54.000000000 -0500
   4 @@ -3,8 +3,8 @@
   5  CONFIG         = qt warn_on release
   6  HEADERS                = config.h xmmsgui2.h filebrowser.h inlineedit.h qinputdialog.h moviewin.h xtoolbutton.h
   7  SOURCES                = song_change.cpp xmmsgui2.cpp filebrowser.cpp inlineedit.cpp qinputdialog.cpp moviewin.cpp xtoolbutton.cpp
   8 -INCLUDEPATH    += . ../.. $(INC_PATH) $(OPIE_INC)
   9 -LIBS            += $(SUB_LIBS) -lpthread -lglib -lqpe
  10 +INCLUDEPATH    += . ../.. $(INC_PATH) $(OPIE_INC) $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  11 +LIBS            += -L$(STAGING_DIR)/lib $(SUB_LIBS) -lpthread -lglib-2.0 -lqpe
  12  #INTERFACES      = xmmsgui2.ui
  13  DESTDIR                = ../../../compiled/xmms/General
  14  TARGET         = QPEgui
  15 diff -urN xmms-embedded.orig/xmms/General/QPEgui/xmms.pro xmms-embedded/xmms/General/QPEgui/xmms.pro
  16 --- xmms-embedded.orig/xmms/General/QPEgui/xmms.pro     2002-11-18 05:13:07.000000000 -0500
  17 +++ xmms-embedded/xmms/General/QPEgui/xmms.pro  2004-03-28 19:05:01.000000000 -0500
  18 @@ -3,8 +3,8 @@
  19  CONFIG         = qt warn_on release
  20  HEADERS                = config.h xmmsgui2.h filebrowser.h inlineedit.h qinputdialog.h moviewin.h xtoolbutton.h
  21  SOURCES                = song_change.cpp xmmsgui2.cpp filebrowser.cpp inlineedit.cpp qinputdialog.cpp moviewin.cpp xtoolbutton.cpp
  22 -INCLUDEPATH    += . ../.. /usr/include/glib-1.2 /usr/lib/glib/include
  23 -LIBS            += -lpthread -lglib -lqpe
  24 +INCLUDEPATH    += . ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  25 +LIBS            += -L$(STAGING_DIR)/lib -lpthread -lglib-2.0 -lqpe
  26  #INTERFACES      = xmmsgui2.ui
  27  DESTDIR                = ../../../compiled/xmms/General
  28  TARGET         = QPEgui
  29 diff -urN xmms-embedded.orig/xmms/Input/fixpvorbis/fixpvorbis.pro xmms-embedded/xmms/Input/fixpvorbis/fixpvorbis.pro
  30 --- xmms-embedded.orig/xmms/Input/fixpvorbis/fixpvorbis.pro     2004-03-28 17:51:10.000000000 -0500
  31 +++ xmms-embedded/xmms/Input/fixpvorbis/fixpvorbis.pro  2004-03-28 19:04:48.000000000 -0500
  32 @@ -12,8 +12,8 @@
  33  vcedit.c \
  34  vorbis.c
  35
  36 -INCLUDEPATH = . ../../include ../.. ../../../Tremor
  37 -LIBS = -lglib -lm -ldl -L../../../compiled -lvorbisidec
  38 +INCLUDEPATH = . ../../include ../.. ../../../Tremor $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  39 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl -L../../../compiled -lvorbisidec
  40  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  41  TMAKE_LFLAGS =
  42  DESTDIR = ../../../compiled/xmms/Input
  43 diff -urN xmms-embedded.orig/xmms/Input/mikmod/mikmod.pro xmms-embedded/xmms/Input/mikmod/mikmod.pro
  44 --- xmms-embedded.orig/xmms/Input/mikmod/mikmod.pro     2004-03-28 17:51:10.000000000 -0500
  45 +++ xmms-embedded/xmms/Input/mikmod/mikmod.pro  2004-03-28 19:04:42.000000000 -0500
  46 @@ -5,8 +5,8 @@
  47  SOURCES = drv_xmms.c \
  48  plugin.c
  49
  50 -INCLUDEPATH = . ../../include ../..
  51 -LIBS = -lglib -lm -ldl -lmikmod
  52 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  53 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl -lmikmod
  54  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  55  TMAKE_LFLAGS =
  56  DESTDIR = ../../../compiled/xmms/Input
  57 diff -urN xmms-embedded.orig/xmms/Input/mplayer/mplayer.pro xmms-embedded/xmms/Input/mplayer/mplayer.pro
  58 --- xmms-embedded.orig/xmms/Input/mplayer/mplayer.pro   2004-03-28 17:39:52.000000000 -0500
  59 +++ xmms-embedded/xmms/Input/mplayer/mplayer.pro        2004-03-28 19:04:30.000000000 -0500
  60 @@ -4,8 +4,8 @@
  61  HEADERS = wav.h
  62  SOURCES = wav.c
  63
  64 -INCLUDEPATH = . ../../include ../..
  65 -LIBS = $(SUB_LIBS) -lglib -lm -ldl
  66 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  67 +LIBS = -L$(STAGING_DIR)/lib $(SUB_LIBS) -lglib-2.0 -lm -ldl
  68  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  69  TMAKE_LFLAGS =
  70  DESTDIR = ../../../compiled/xmms/Input
  71 diff -urN xmms-embedded.orig/xmms/Input/mplayer/wav.pro xmms-embedded/xmms/Input/mplayer/wav.pro
  72 --- xmms-embedded.orig/xmms/Input/mplayer/wav.pro       2004-03-28 17:51:10.000000000 -0500
  73 +++ xmms-embedded/xmms/Input/mplayer/wav.pro    2004-03-28 19:04:36.000000000 -0500
  74 @@ -4,8 +4,8 @@
  75  HEADERS = wav.h
  76  SOURCES = wav.c
  77
  78 -INCLUDEPATH = . ../../include ../..
  79 -LIBS = -lglib -lm -ldl
  80 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  81 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl
  82  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  83  TMAKE_LFLAGS =
  84  DESTDIR = ../../../compiled/xmms/Input
  85 diff -urN xmms-embedded.orig/xmms/Input/shorten/shorten.pro xmms-embedded/xmms/Input/shorten/shorten.pro
  86 --- xmms-embedded.orig/xmms/Input/shorten/shorten.pro   2004-03-28 17:51:10.000000000 -0500
  87 +++ xmms-embedded/xmms/Input/shorten/shorten.pro        2004-03-28 19:04:25.000000000 -0500
  88 @@ -16,8 +16,8 @@
  89  wave.c
  90
  91
  92 -INCLUDEPATH = . ../../include ../..
  93 -LIBS = -lglib -lm -ldl
  94 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
  95 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl
  96  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
  97  TMAKE_LFLAGS =
  98  DESTDIR = ../../../compiled/xmms/Input
  99 diff -urN xmms-embedded.orig/xmms/Input/wav/wav.pro xmms-embedded/xmms/Input/wav/wav.pro
 100 --- xmms-embedded.orig/xmms/Input/wav/wav.pro   2004-03-28 17:51:10.000000000 -0500
 101 +++ xmms-embedded/xmms/Input/wav/wav.pro        2004-03-28 19:04:19.000000000 -0500
 102 @@ -4,8 +4,8 @@
 103  HEADERS = wav.h
 104  SOURCES = wav.c
 105
 106 -INCLUDEPATH = . ../../include ../..
 107 -LIBS = -lglib -lm -ldl
 108 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 109 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl
 110  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 111  TMAKE_LFLAGS =
 112  DESTDIR = ../../../compiled/xmms/Input
 113 diff -urN xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.pro xmms-embedded/xmms/Input/xmms-mad/xmms-mad.pro
 114 --- xmms-embedded.orig/xmms/Input/xmms-mad/xmms-mad.pro 2004-03-28 17:51:10.000000000 -0500
 115 +++ xmms-embedded/xmms/Input/xmms-mad/xmms-mad.pro      2004-03-28 19:04:12.000000000 -0500
 116 @@ -11,8 +11,8 @@
 117  xing.c \
 118  xmms-mad.c
 119
 120 -INCLUDEPATH = . ../..
 121 -LIBS = -lid3tag -lz -lmad -lglib -ldl -L../../../compiled -lxmms -lm
 122 +INCLUDEPATH = . ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 123 +LIBS = -L$(STAGING_DIR)/lib -lid3tag -lz -lmad -lglib-2.0 -ldl -L../../../compiled -lxmms -lm
 124  #TMAKE_CFLAGS = -O2 -fPIC -DHAVE_CONFIG_H -DPIC
 125  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H -DNOGUI -DSLOWCPU
 126  TMAKE_LFLAGS =
 127 diff -urN xmms-embedded.orig/xmms/Input/xmms-sid/xmms-sid.pro xmms-embedded/xmms/Input/xmms-sid/xmms-sid.pro
 128 --- xmms-embedded.orig/xmms/Input/xmms-sid/xmms-sid.pro 2004-03-28 17:51:10.000000000 -0500
 129 +++ xmms-embedded/xmms/Input/xmms-sid/xmms-sid.pro      2004-03-28 19:04:05.000000000 -0500
 130 @@ -11,8 +11,8 @@
 131  xs_init.c \
 132  xs_stil.c
 133
 134 -INCLUDEPATH = . ../..
 135 -LIBS = -lglib -lm -ldl -lsidplay
 136 +INCLUDEPATH = . ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 137 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl -lsidplay
 138  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops "-DVERSION=\"1.0.0\""
 139  TMAKE_LFLAGS =
 140  DESTDIR = ../../../compiled/xmms/Input
 141 diff -urN xmms-embedded.orig/xmms/libxmms/libxmms.pro xmms-embedded/xmms/libxmms/libxmms.pro
 142 --- xmms-embedded.orig/xmms/libxmms/libxmms.pro 2004-03-28 17:51:10.000000000 -0500
 143 +++ xmms-embedded/xmms/libxmms/libxmms.pro      2004-03-28 19:03:44.000000000 -0500
 144 @@ -16,8 +16,8 @@
 145  util.c \
 146  xmmsctrl.c
 147
 148 -INCLUDEPATH = . ../include
 149 -LIBS = -lglib -lm -ldl
 150 +INCLUDEPATH = . ../include $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 151 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl
 152  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 153  TMAKE_LFLAGS = -export-dynamic
 154  DESTDIR = ../../compiled
 155 diff -urN xmms-embedded.orig/xmms/Output/OSS/oss.pro xmms-embedded/xmms/Output/OSS/oss.pro
 156 --- xmms-embedded.orig/xmms/Output/OSS/oss.pro  2004-03-28 17:51:10.000000000 -0500
 157 +++ xmms-embedded/xmms/Output/OSS/oss.pro       2004-03-28 19:03:59.000000000 -0500
 158 @@ -10,8 +10,8 @@
 159  mixer.c \
 160  OSS.c
 161
 162 -INCLUDEPATH = . ../../include ../..
 163 -LIBS = -lglib -lm -ldl
 164 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 165 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -lm -ldl
 166  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 167  TMAKE_LFLAGS =
 168  DESTDIR = ../../../compiled/xmms/Output
 169 diff -urN xmms-embedded.orig/xmms/Output/OSS/OSS.pro xmms-embedded/xmms/Output/OSS/OSS.pro
 170 --- xmms-embedded.orig/xmms/Output/OSS/OSS.pro  2004-03-28 17:39:52.000000000 -0500
 171 +++ xmms-embedded/xmms/Output/OSS/OSS.pro       2004-03-28 19:03:53.000000000 -0500
 172 @@ -10,8 +10,8 @@
 173  mixer.c \
 174  OSS.c
 175
 176 -INCLUDEPATH = . ../../include ../..
 177 -LIBS = $(SUB_LIBS) -lglib -lm -ldl
 178 +INCLUDEPATH = . ../../include ../.. $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 179 +LIBS = -L$(STAGING_DIR)/lib $(SUB_LIBS) -lglib-2.0 -lm -ldl
 180  TMAKE_CFLAGS = -O2 -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H
 181  TMAKE_LFLAGS =
 182  DESTDIR = ../../../compiled/xmms/Output
 183 diff -urN xmms-embedded.orig/xmms/xmms/xmms.pro xmms-embedded/xmms/xmms/xmms.pro
 184 --- xmms-embedded.orig/xmms/xmms/xmms.pro       2004-03-28 17:51:10.000000000 -0500
 185 +++ xmms-embedded/xmms/xmms/xmms.pro    2004-03-28 19:03:35.000000000 -0500
 186 @@ -30,8 +30,8 @@
 187  pluginenum.c \
 188  urldecode.c \
 189  util.c
 190 -INCLUDEPATH = . .. ../include
 191 -LIBS = -lglib -L../../compiled -lxmms
 192 +INCLUDEPATH = . .. ../include $(QTDIR)/include $(STAGING_DIR)/include/glib-2.0 $(STAGING_DIR)/include
 193 +LIBS = -L$(STAGING_DIR)/lib -lglib-2.0 -L../../compiled -lxmms
 194  TMAKE_CFLAGS = -g -O2 -Wall -Wpointer-arith -finline-functions -ffast-math -funroll-all-loops -DHAVE_CONFIG_H -DPLUGIN_DIR=\"/opt/QtPalmtop/lib/xmms\" -DLOCALEDIR=\"/usr/local/share/locale\" -DPLUGINSUBS=\"Output\",\"Input\",\"Effect\",\"General\"
 195  TMAKE_LFLAGS = -export-dynamic
 196  DESTDIR = ../../compiled/bin