1 --- gpac/configure.orig 2011-05-29 20:37:20.841571383 +0200
2 +++ gpac/configure 2011-05-29 20:50:56.841598707 +0200
7 -LDFLAGS="$LDFLAGS -Wl --warn-common"
8 +LDFLAGS="$LDFLAGS -Wl,--warn-common"
11 GPAC_SH_FLAGS=-lpthread
12 --- gpac/applications/osmo4_wx/Makefile.orig 2011-05-29 20:52:03.848267616 +0200
13 +++ gpac/applications/osmo4_wx/Makefile 2011-05-29 21:08:38.408300918 +0200
18 - $(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) -lz
19 + $(CXX) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) `pkg-config --libs gtk+-2.0` -lz
22 $(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $<
23 --- gpac/src/Makefile~ 2011-07-24 16:46:39.000000000 +0200
24 +++ gpac/src/Makefile 2011-07-24 16:53:33.607729885 +0200
29 -ifneq ($(prefix), /usr/local)
30 -EXTRALIBS+=-L$(prefix)/lib
32 -ifneq ($(prefix), /usr)
33 -EXTRALIBS+=-L$(prefix)/lib
37 ## libgpac compositor compilation options
40 --- gpac/applications/mp4client/Makefile~ 2011-07-24 16:54:03.000000000 +0200
41 +++ gpac/applications/mp4client/Makefile 2011-07-24 16:57:28.613989434 +0200
46 -ifneq ($(CONFIG_JPEG), no)
47 -LINKLIBS+= -L$(prefix)/lib
49 -ifneq ($(CONFIG_PNG), no)
50 -LINKLIBS+= -L$(prefix)/lib
52 -ifneq ($(TRISCOPE_MODE), no)
53 -LINKLIBS+= -L$(prefix)/lib
58 ifeq ($(CONFIG_JPEG), no)
61 --- gpac/modules/jack/Makefile~ 2008-11-24 10:14:19.000000000 +0100
62 +++ gpac/modules/jack/Makefile 2011-07-24 17:01:53.625253667 +0200
67 - $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -ljack
68 + $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac -ljack