diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-video/gpac/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-video/gpac/files')
-rw-r--r-- | media-video/gpac/files/gpac-0.8.1-configure.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/media-video/gpac/files/gpac-0.8.1-configure.patch b/media-video/gpac/files/gpac-0.8.1-configure.patch new file mode 100644 index 000000000000..4a6c97b6cf3a --- /dev/null +++ b/media-video/gpac/files/gpac-0.8.1-configure.patch @@ -0,0 +1,100 @@ +diff --git a/Makefile b/Makefile +index 61241cd..7481027 100644 +--- a/Makefile ++++ b/Makefile +@@ -270,7 +270,9 @@ ifeq ($(GPAC_ENST), yes) + $(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst" + endif + mkdir -p "$(DESTDIR)$(prefix)/$(libdir)" ++ifeq ($(STATIC_LIBS),yes) + $(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)" ++endif + if [ -d $(DESTDIR)$(prefix)/$(libdir)/pkgconfig ] ; then \ + $(INSTALL) $(INSTFLAGS) -m 644 gpac.pc "$(DESTDIR)$(prefix)/$(libdir)/pkgconfig" ; \ + fi +diff --git a/configure b/configure +index 6ef2258..240b6b0 100755 +--- a/configure ++++ b/configure +@@ -108,6 +108,7 @@ has_xmlrpc="no" + has_openjpeg="no" + gprof_build="no" + static_build="no" ++static_libs="no" + want_pic="no" + want_gcov="no" + has_joystick="no" +@@ -266,6 +267,7 @@ GPAC configuration options: + --enable-amr-wb enable AMR WB library + --enable-amr enable both AMR NB and WB libraries + --enable-static-bin link statically against libgpac ++ --enable-static-lib GPAC static libraries build + --static-mp4box configure for static linking of MP4Box only. + --enable-depth enables depth handling in the compositor + +@@ -715,15 +717,6 @@ if docc -lz -Wno-pointer-sign ; then + CFLAGS="$CFLAGS -Wno-pointer-sign" + fi + +- +-#GCC opt +-if test "$no_gcc_opt" = "no"; then +- CFLAGS="-O3 $CFLAGS" +-else +- CFLAGS="-O0 $CFLAGS" +-fi +- +- + #GCC PIC + if test "$cross_prefix" != "" ; then + want_pic="no" +@@ -1931,6 +1924,8 @@ for opt do + ;; + --enable-static-bin) static_build="yes"; + ;; ++ --enable-static-lib) static_libs="yes"; ++ ;; + --disable-ipv6) has_ipv6="no" + ;; + --disable-wx) has_wx="no" +@@ -2622,6 +2617,7 @@ echo "** GPAC $version rev$revision Core Configuration **" + echo "debug version: $debuginfo" + echo "GProf enabled: $gprof_build" + echo "Static build enabled: $static_build" ++echo "Static libs enabled: $static_libs" + echo "Memory tracking enabled: $use_memory_tracking" + echo "Sanitizer enabled: $enable_sanitizer" + echo "Fixed-Point Version: $use_fixed_point" +@@ -3291,6 +3287,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak + echo "GPROFBUILD=$gprof_build" >> config.mak + echo "MP4BOX_STATIC=$static_mp4box" >> config.mak + echo "STATICBUILD=$static_build" >> config.mak ++echo "STATICLIBS=$static_libs" >> config.mak + + echo "CONFIG_IPV6=$has_ipv6" >> config.mak + if test "$has_ipv6" = "yes" ; then +diff --git a/src/Makefile b/src/Makefile +index 935ffff..b3464b7 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -269,16 +269,19 @@ compositor: $(LIBGPAC_COMPOSITOR) + + ifeq ($(CONFIG_DARWIN),yes) + ++ifeq ($(STATICLIBS),yes) + $(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS) + $(RANLIB) ../bin/gcc/libgpac_static.a ++endif + ifneq ($(STATICBUILD),yes) + $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS) + endif + + else +- ++ifeq ($(STATICLIBS), yes) + $(AR) cr ../bin/gcc/libgpac_static.a $(OBJS) + $(RANLIB) ../bin/gcc/libgpac_static.a ++endif + ifneq ($(STATICBUILD),yes) + $(CC) $(SHFLAGS) $(LD_SONAME) -o $@ $(OBJS) $(EXTRALIBS) $(LDFLAGS) + mv $@ $@.$(VERSION_SONAME) |