- Allow --with osmo conditional - Explicitely list binaries.el8
Nicolas Chauvet
15 years ago
parent
a6fb2e0b26
commit
5c36022be1
@ -1 +1 @@
|
||||
gpac-20100116.tar.bz2
|
||||
gpac-20100527.tar.bz2
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff -up gpac/configure.lib64 gpac/configure
|
||||
--- gpac/configure.lib64 2008-12-17 14:25:31.000000000 +0100
|
||||
+++ gpac/configure 2008-12-17 14:26:24.000000000 +0100
|
||||
@@ -1126,10 +1126,10 @@ if test "$disable_opengl" = "no" ; then
|
||||
fi
|
||||
if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then
|
||||
has_opengl="yes"
|
||||
- elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
|
||||
+ elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
|
||||
has_opengl="yes"
|
||||
INCL3D="-I$X11_PATH/include"
|
||||
- LINK3D="-L$X11_PATH/lib $LINK3D"
|
||||
+ LINK3D="-L$X11_PATH/lib64 $LINK3D"
|
||||
fi
|
||||
if test "$has_opengl" = "no" ; then
|
||||
LINK3D=""
|
||||
@@ -1186,7 +1186,7 @@ cat > $TMPC << EOF
|
||||
#include <X11/Xlib.h>
|
||||
int main( void ) { return 0; }
|
||||
EOF
|
||||
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
|
||||
+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
|
||||
has_x11="yes"
|
||||
|
||||
#look for X11 shared memory support
|
||||
@@ -1198,7 +1198,7 @@ cat > $TMPC << EOF
|
||||
int main( void ) { return 0; }
|
||||
EOF
|
||||
|
||||
-if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then
|
||||
+if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib64 2> /dev/null ; then
|
||||
has_x11_shm="yes"
|
||||
fi
|
||||
|
||||
@ -1,96 +0,0 @@
|
||||
diff -up gpac/applications/generators/SVG/Makefile.shared gpac/applications/generators/SVG/Makefile
|
||||
--- gpac/applications/generators/SVG/Makefile.shared 2007-01-09 13:43:57.000000000 +0100
|
||||
+++ gpac/applications/generators/SVG/Makefile 2008-02-17 17:56:49.000000000 +0100
|
||||
@@ -15,7 +15,7 @@ LDFLAGS+=-pg
|
||||
endif
|
||||
|
||||
#common obj
|
||||
-OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
+OBJS= html.o laser.o main.o v1.o v2.o v3.o
|
||||
|
||||
CFLAGS+=-g
|
||||
LDFLAGS+=-g
|
||||
@@ -24,10 +24,12 @@ CFLAGS+=$(XML2_CFLAGS)
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
EXE=.exe
|
||||
PROG=SVGGen$(EXE)
|
||||
+OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
EXTRALIBS+=-lwsock32 -lz
|
||||
else
|
||||
EXT=
|
||||
PROG=SVGGen
|
||||
+LIBS=-L../../../bin/gcc/ -lgpac
|
||||
endif
|
||||
|
||||
SRCS := $(OBJS:.o=.c)
|
||||
@@ -35,7 +37,7 @@ SRCS := $(OBJS:.o=.c)
|
||||
all: $(PROG)
|
||||
|
||||
SVGGen$(EXE): $(OBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS)
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS)
|
||||
|
||||
|
||||
%.o: %.c
|
||||
diff -up gpac/applications/generators/X3D/Makefile.shared gpac/applications/generators/X3D/Makefile
|
||||
--- gpac/applications/generators/X3D/Makefile.shared 2006-05-24 11:52:52.000000000 +0200
|
||||
+++ gpac/applications/generators/X3D/Makefile 2008-02-17 17:56:09.000000000 +0100
|
||||
@@ -15,15 +15,16 @@ LDFLAGS+=-pg
|
||||
endif
|
||||
|
||||
#common obj
|
||||
-OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
+OBJS= main.o
|
||||
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
EXE=.exe
|
||||
PROG=X3DGen$(EXE)
|
||||
+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
else
|
||||
-OBJS+=../../../src/utils/os_divers.o
|
||||
EXT=
|
||||
PROG=X3DGen
|
||||
+LIBS=-L../../../bin/gcc/ -lgpac
|
||||
endif
|
||||
|
||||
SRCS := $(OBJS:.o=.c)
|
||||
@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c)
|
||||
all: $(PROG)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS)
|
||||
|
||||
|
||||
%.o: %.c
|
||||
diff -up gpac/applications/generators/MPEG4/Makefile.shared gpac/applications/generators/MPEG4/Makefile
|
||||
--- gpac/applications/generators/MPEG4/Makefile.shared 2006-05-24 11:52:52.000000000 +0200
|
||||
+++ gpac/applications/generators/MPEG4/Makefile 2008-02-17 17:55:25.000000000 +0100
|
||||
@@ -15,15 +15,16 @@ LDFLAGS+=-pg
|
||||
endif
|
||||
|
||||
#common obj
|
||||
-OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
+OBJS= main.o
|
||||
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
EXE=.exe
|
||||
PROG=MPEG4Gen$(EXE)
|
||||
+OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o
|
||||
else
|
||||
-OBJS+=../../../src/utils/os_divers.o
|
||||
EXT=
|
||||
PROG=MPEG4Gen
|
||||
+LIBS=-L../../../bin/gcc/ -lgpac
|
||||
endif
|
||||
|
||||
SRCS := $(OBJS:.o=.c)
|
||||
@@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c)
|
||||
all: $(PROG)
|
||||
|
||||
$(PROG): $(OBJS)
|
||||
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS)
|
||||
|
||||
|
||||
%.o: %.c
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up gpac/src/Makefile.soname gpac/src/Makefile
|
||||
--- gpac/src/Makefile.soname 2008-12-02 15:01:08.000000000 +0100
|
||||
+++ gpac/src/Makefile 2008-12-17 11:55:52.000000000 +0100
|
||||
@@ -171,6 +171,7 @@ ifeq ($(CONFIG_DARWIN),yes)
|
||||
LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
|
||||
endif
|
||||
EXTRALIBS+=$(GPAC_SH_FLAGS)
|
||||
+LDFLAGS+="-Wl,-soname,libgpac.so.0"
|
||||
endif
|
||||
|
||||
ifeq ($(WANT_PIC),yes)
|
||||
@ -1,36 +0,0 @@
|
||||
diff -up gpac/configure.openjpeg gpac/configure
|
||||
--- gpac/configure.openjpeg 2008-02-17 15:16:22.000000000 +0100
|
||||
+++ gpac/configure 2008-02-17 15:16:31.000000000 +0100
|
||||
@@ -526,17 +526,17 @@ fi
|
||||
#look for OpenJPEG support
|
||||
cat > $TMPC << EOF
|
||||
#include <stdio.h>
|
||||
-#include <openjpeg.h>
|
||||
+#include <openjpeg/openjpeg.h>
|
||||
int main( void ) { return 0; }
|
||||
EOF
|
||||
|
||||
-if $cc -o $TMPO $TMPC -lopenjpeg 2> /dev/null ; then
|
||||
+if $cc -o $TMPO $TMPC -lopenjpeg -lm -L${libdir} 2> /dev/null ; then
|
||||
has_openjpeg="system"
|
||||
elif test "$alt_macosx_dir" != "" ; then
|
||||
if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib -ljpeg 2> /dev/null ; then
|
||||
has_openjpeg="system"
|
||||
fi
|
||||
-elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg 2> /dev/null ; then
|
||||
+elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg -lm 2> /dev/null ; then
|
||||
has_openjpeg="local"
|
||||
fi
|
||||
|
||||
diff -up gpac/modules/img_in/jp2_dec.c.openjpeg gpac/modules/img_in/jp2_dec.c
|
||||
--- gpac/modules/img_in/jp2_dec.c.openjpeg 2007-09-12 18:47:11.000000000 +0200
|
||||
+++ gpac/modules/img_in/jp2_dec.c 2008-02-17 15:16:22.000000000 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
#ifdef GPAC_HAS_JP2
|
||||
|
||||
-#include <openjpeg.h>
|
||||
+#include <openjpeg/openjpeg.h>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up gpac/configure.ogl_libs gpac/configure
|
||||
--- gpac/configure.ogl_libs 2009-09-19 13:29:46.988993098 +0200
|
||||
+++ gpac/configure 2009-09-19 13:33:34.840741932 +0200
|
||||
@@ -1319,7 +1319,7 @@ if test "$disable_3d" = "no" ; then
|
||||
elif test "$darwin" = "yes" ; then
|
||||
LINK3D="-lgl -lglu"
|
||||
else
|
||||
- LINK3D="-lGL -lglut"
|
||||
+ LINK3D="-lGLU -lGL -lglut"
|
||||
fi
|
||||
if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then
|
||||
has_opengl="yes"
|
||||
@ -0,0 +1,14 @@
|
||||
--- gpac/configure.osmo 2010-05-27 13:25:30.365191378 -0600
|
||||
+++ gpac/configure 2010-05-27 14:03:08.494369924 -0600
|
||||
@@ -1007,6 +1016,11 @@ wx_cflags=`wx-config --cppflags core, ba
|
||||
wx_lflags=`wx-config --libs core, base`
|
||||
fi
|
||||
|
||||
+if test "$has_wx" = "yes"; then
|
||||
+wx_lflags="${wx_lflags} `gtk-config --libs`"
|
||||
+wx_lflags="${wx_lflags} `pkg-config --libs gdk-2.0` -lstdc++"
|
||||
+fi
|
||||
+
|
||||
if test "$darwin" = "yes" ; then
|
||||
wx_lflags="-Wl,-bind_at_load $wx_lflags -lstdc++" #10.4 needs it, not sure about 10.3
|
||||
fi
|
||||
@ -0,0 +1,57 @@
|
||||
diff -up gpac/src/Makefile.soname gpac/src/Makefile
|
||||
--- gpac/src/Makefile.soname 2010-05-29 15:48:35.000000000 +0200
|
||||
+++ gpac/src/Makefile 2010-05-29 15:57:23.000000000 +0200
|
||||
@@ -158,27 +158,27 @@ endif
|
||||
|
||||
|
||||
##libgpac library output
|
||||
-LIB=libgpac.$(DYN_LIB_SUFFIX)
|
||||
+LIBGPAC=libgpac.$(DYN_LIB_SUFFIX)
|
||||
+LIBGPAC_SOVERSION=".0"
|
||||
+LIBGPAC_SONAME=$(LIBGPAC)$(LIBGPAC_SOVERSION)
|
||||
+LD_SONAME="-Wl,-soname,$(LIBGPAC_SONAME)"
|
||||
ifeq ($(CONFIG_WIN32),yes)
|
||||
#LDFLAGS+=-export-symbols libgpac.def
|
||||
+LD_SONAME=
|
||||
else
|
||||
ifeq ($(CONFIG_DARWIN),yes)
|
||||
-LDFLAGS+=-install_name $(prefix)/lib/$(LIB)
|
||||
+LDFLAGS+=-install_name $(prefix)/lib/$(LIBGPAC)
|
||||
+LD_SONAME=
|
||||
endif
|
||||
EXTRALIBS+=$(GPAC_SH_FLAGS)
|
||||
endif
|
||||
|
||||
-LD_SONAME="-Wl,-soname,$(LIB)"
|
||||
-ifeq ($(CONFIG_DARWIN), yes)
|
||||
-LD_SONAME=
|
||||
-endif
|
||||
-
|
||||
|
||||
SRCS := $(OBJS:.o=.c)
|
||||
|
||||
all: lib
|
||||
|
||||
-lib: $(LIB)
|
||||
+lib: $(LIBGPAC)
|
||||
|
||||
#there's a bunch of warnings in there, get rid of them
|
||||
mcrypt: CFLAGS= $(OPTFLAGS) -w -I$(SRC_PATH)/include
|
||||
@@ -197,7 +197,7 @@ compositor: $(LIBGPAC_COMPOSITOR)
|
||||
$(CC) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
|
||||
-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
|
||||
+$(LIBGPAC): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
|
||||
ifeq ($(CONFIG_DARWIN),yes)
|
||||
libtool -s -o ../bin/gcc/libgpac_static.a $(OBJS)
|
||||
ranlib ../bin/gcc/libgpac_static.a
|
||||
@@ -215,7 +215,7 @@ depend:
|
||||
$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
|
||||
|
||||
clean:
|
||||
- rm -f $(OBJS) ../bin/gcc/$(LIB)
|
||||
+ rm -f $(OBJS) ../bin/gcc/$(LIBGPAC)
|
||||
rm -rf ../bin/gcc/libgpac_static.a
|
||||
|
||||
distclean: clean
|
||||
Loading…
Reference in new issue