svn commit: r543894 - in branches/2020Q3/multimedia: gpac-libgpac gpac-libgpac/files gpac-mp4box
Thomas Zander
riggs at FreeBSD.org
Sat Aug 1 07:27:07 UTC 2020
Author: riggs
Date: Sat Aug 1 07:27:04 2020
New Revision: 543894
URL: https://svnweb.freebsd.org/changeset/ports/543894
Log:
MFH: r542531 r543892 r543893
Update to upstream version 1.0.0
PR: 245932
Submitted by: shoesoft at gmx.net
Reviewed by: riggs
Enable static modules (preparation for build fix of multimedia/gpac-mp4box)
PR: 245933
Reported by: shoesoft at gmx.net
Reviewed by: rene, riggs
Un-break build, update to 1.0.0, switch to GitHub repository.
PR: 245933
Submitted by: shoesoft at gmx.net
Reviewed by: rene, riggs
Approved by: maintainer timeout
Approved by: ports-secteam (build fix blanket)
Added:
branches/2020Q3/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c
- copied unchanged from r542531, head/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c
Deleted:
branches/2020Q3/multimedia/gpac-libgpac/files/patch-export-x264-symbols
Modified:
branches/2020Q3/multimedia/gpac-libgpac/Makefile
branches/2020Q3/multimedia/gpac-libgpac/distinfo
branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c
branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c
branches/2020Q3/multimedia/gpac-libgpac/pkg-plist
branches/2020Q3/multimedia/gpac-mp4box/Makefile
branches/2020Q3/multimedia/gpac-mp4box/distinfo
Directory Properties:
branches/2020Q3/ (props changed)
Modified: branches/2020Q3/multimedia/gpac-libgpac/Makefile
==============================================================================
--- branches/2020Q3/multimedia/gpac-libgpac/Makefile Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-libgpac/Makefile Sat Aug 1 07:27:04 2020 (r543894)
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= gpac
-PORTVERSION= 0.5.0
-PORTREVISION= 2
+DISTVERSIONPREFIX= v
+DISTVERSION= 1.0.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia
-MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
PKGNAMESUFFIX= -libgpac
MAINTAINER= multimedia at FreeBSD.org
@@ -14,10 +14,16 @@ COMMENT= Gpac MPEG-4 Systems library and headers
LICENSE= LGPL21
-WRKSRC= ${WRKDIR}/gpac
+BUILD_DEPENDS= bash:shells/bash
+
ALL_TARGET= lib
INSTALL_TARGET= install-lib
-USES= gmake dos2unix
+USES= gmake dos2unix shebangfix
+SHEBANG_FILES= check_revision.sh
+bash_OLD_CMD+= /bin/sh
+USE_GITHUB= yes
+GH_ACCOUNT= gpac
+GH_PROJECT= gpac
HAS_CONFIGURE= yes
USE_LDCONFIG= yes
DOS2UNIX_FILES= src/utils/os_config_init.c
@@ -30,6 +36,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --X11-path="${LOCALBASE}" \
--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
+ --static-modules \
--enable-pic \
--disable-wx \
--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
Modified: branches/2020Q3/multimedia/gpac-libgpac/distinfo
==============================================================================
--- branches/2020Q3/multimedia/gpac-libgpac/distinfo Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-libgpac/distinfo Sat Aug 1 07:27:04 2020 (r543894)
@@ -1,2 +1,3 @@
-SHA256 (gpac-0.5.0.tar.gz) = 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24
-SIZE (gpac-0.5.0.tar.gz) = 7861057
+TIMESTAMP = 1595078627
+SHA256 (gpac-gpac-v1.0.0_GH0.tar.gz) = ebcca41993e51706c891dba4e9fe03b59bc671c41910bc6c303ba3feeb7f1b20
+SIZE (gpac-gpac-v1.0.0_GH0.tar.gz) = 10289999
Modified: branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c
==============================================================================
--- branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c Sat Aug 1 07:27:04 2020 (r543894)
@@ -1,6 +1,6 @@
---- src/utils/os_config_init.c.orig 2012-03-27 13:48:05.000000000 +0400
-+++ src/utils/os_config_init.c 2013-10-12 14:29:52.214068862 +0400
-@@ -51,6 +51,9 @@
+--- src/utils/os_config_init.c.orig 2020-06-16 16:17:17 UTC
++++ src/utils/os_config_init.c
+@@ -58,6 +58,9 @@
#else
#ifdef GPAC_CONFIG_LINUX
#include <unistd.h>
@@ -8,32 +8,29 @@
+#include <sys/types.h>
+#include <sys/sysctl.h>
#endif
- #define CFG_FILE_NAME ".gpacrc"
- #define TEST_MODULE "gm_dummy_in.so"
-@@ -225,7 +228,11 @@
- {
- char app_path[GF_MAX_PATH];
+ #ifdef GPAC_CONFIG_ANDROID
+ #define DEFAULT_ANDROID_PATH_APP "/data/data/com.gpac.Osmo4"
+@@ -294,6 +297,8 @@ static Bool get_default_install_path(char *file_path,
char *sep;
-+#ifdef GPAC_CONFIG_FREEBSD
+ #if (defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_LINUX))
+ u32 size;
++#elif defined(GPAC_CONFIG_FREEBSD)
+ size_t size = GF_MAX_PATH;
-+#else
- u32 size = GF_MAX_PATH;
-+#endif
+ #endif
/*on OSX, Linux & co, user home is where we store the cfg file*/
- if (path_type==GF_PATH_CFG) {
-@@ -252,6 +259,14 @@
- if (sep) sep[0] = 0;
- return 1;
- }
+@@ -369,6 +374,14 @@ static Bool get_default_install_path(char *file_path,
+ if (sep) {
+ strcpy(file_path, sep);
+ }
++ return 1;
++ }
+#elif defined(GPAC_CONFIG_FREEBSD)
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+ sysctl(mib, 4, file_path, &size, NULL, 0);
+ if (size>0) {
+ char *sep = strrchr(file_path, '/');
+ if (sep) sep[0] = 0;
-+ return 1;
-+ }
+ return 1;
+ }
#endif
- return 0;
- }
Modified: branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c
==============================================================================
--- branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c Sat Aug 1 07:27:04 2020 (r543894)
@@ -1,6 +1,6 @@
---- src/utils/os_divers.c.orig 2012-04-04 18:47:33.000000000 +0400
-+++ src/utils/os_divers.c 2013-10-12 14:25:42.047109095 +0400
-@@ -1533,6 +1533,123 @@
+--- src/utils/os_divers.c.orig 2020-06-16 16:17:17 UTC
++++ src/utils/os_divers.c
+@@ -1680,6 +1680,123 @@ Bool gf_sys_get_rti_os(u32 refresh_time_ms, GF_SystemR
return 1;
}
Copied: branches/2020Q3/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c (from r542531, head/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q3/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c Sat Aug 1 07:27:04 2020 (r543894, copy of r542531, head/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c)
@@ -0,0 +1,29 @@
+--- src/quickjs/quickjs.c.orig 2020-06-16 16:17:17 UTC
++++ src/quickjs/quickjs.c
+@@ -38,6 +38,8 @@
+ #include <malloc/malloc.h>
+ #elif defined(__linux__) || defined(__NX__)
+ #include <malloc.h>
++#elif defined(__FreeBSD__)
++#include <malloc_np.h>
+ #endif
+
+ #include "cutils.h"
+@@ -1515,7 +1517,7 @@ static inline size_t js_def_malloc_usable_size(void *p
+ return _msize(ptr);
+ #elif defined(EMSCRIPTEN)
+ return 0;
+-#elif defined(__linux__) || defined(__NX__)
++#elif defined(__linux__) || defined(__NX__) || defined(__FreeBSD__)
+ return malloc_usable_size(ptr);
+ #else
+ /* change this to `return 0;` if compilation fails */
+@@ -1589,7 +1591,7 @@ static const JSMallocFunctions def_malloc_funcs = {
+ (size_t (*)(const void *))_msize,
+ #elif defined(EMSCRIPTEN)
+ NULL,
+-#elif defined(__linux__) || defined(__NX__)
++#elif defined(__linux__) || defined(__NX__) || defined(__FreeBSD__)
+ (size_t (*)(const void *))malloc_usable_size,
+ #else
+ /* change this to `NULL,` if compilation fails */
Modified: branches/2020Q3/multimedia/gpac-libgpac/pkg-plist
==============================================================================
--- branches/2020Q3/multimedia/gpac-libgpac/pkg-plist Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-libgpac/pkg-plist Sat Aug 1 07:27:04 2020 (r543894)
@@ -1,4 +1,7 @@
+include/gpac/00_doxy.h
+include/gpac/Remotery.h
include/gpac/ait.h
+include/gpac/atsc.h
include/gpac/avparse.h
include/gpac/base_coding.h
include/gpac/bifs.h
@@ -10,13 +13,17 @@ include/gpac/config_file.h
include/gpac/configuration.h
include/gpac/constants.h
include/gpac/crypt.h
+include/gpac/crypt_tools.h
+include/gpac/dash.h
include/gpac/download.h
include/gpac/dsmcc.h
include/gpac/dvb_mpe.h
-include/gpac/esi.h
include/gpac/events.h
include/gpac/events_constants.h
-include/gpac/filestreamer.h
+include/gpac/evg.h
+include/gpac/filters.h
+include/gpac/html5_media.h
+include/gpac/html5_mse.h
include/gpac/ietf.h
include/gpac/internal/avilib.h
include/gpac/internal/bifs_dev.h
@@ -31,45 +38,40 @@ include/gpac/internal/laser_dev.h
include/gpac/internal/m3u8.h
include/gpac/internal/media_dev.h
include/gpac/internal/mesh.h
-include/gpac/internal/mpd.h
include/gpac/internal/odf_dev.h
include/gpac/internal/odf_parse_common.h
include/gpac/internal/ogg.h
include/gpac/internal/reedsolomon.h
include/gpac/internal/scenegraph_dev.h
-include/gpac/internal/smjs_api.h
include/gpac/internal/swf_dev.h
-include/gpac/internal/terminal_dev.h
include/gpac/internal/vobsub.h
include/gpac/ismacryp.h
include/gpac/iso639.h
include/gpac/isomedia.h
include/gpac/laser.h
include/gpac/list.h
-include/gpac/math.h
+include/gpac/main.h
+include/gpac/maths.h
include/gpac/media_tools.h
include/gpac/mediaobject.h
include/gpac/module.h
include/gpac/modules/audio_out.h
include/gpac/modules/codec.h
+include/gpac/modules/compositor_ext.h
include/gpac/modules/font.h
include/gpac/modules/hardcoded_proto.h
include/gpac/modules/ipmp.h
-include/gpac/modules/js_usr.h
-include/gpac/modules/raster2d.h
-include/gpac/modules/service.h
-include/gpac/modules/term_ext.h
include/gpac/modules/video_out.h
+include/gpac/mpd.h
include/gpac/mpeg4_odf.h
include/gpac/mpegts.h
include/gpac/network.h
include/gpac/nodes_mpeg4.h
include/gpac/nodes_svg.h
include/gpac/nodes_x3d.h
-include/gpac/nodes_xbl.h
include/gpac/options.h
include/gpac/path2d.h
-include/gpac/ringbuffer.h
+include/gpac/revision.h
include/gpac/rtp_streamer.h
include/gpac/scene_engine.h
include/gpac/scene_manager.h
@@ -84,13 +86,13 @@ include/gpac/terminal.h
include/gpac/thread.h
include/gpac/token.h
include/gpac/tools.h
-include/gpac/unicode.h
include/gpac/user.h
include/gpac/utf.h
include/gpac/version.h
+include/gpac/webvtt.h
include/gpac/xml.h
lib/libgpac.so
-lib/libgpac.so.2
-lib/libgpac.so.2.0.0
+lib/libgpac.so.10
+lib/libgpac.so.10.0.0
lib/libgpac_static.a
libdata/pkgconfig/gpac.pc
Modified: branches/2020Q3/multimedia/gpac-mp4box/Makefile
==============================================================================
--- branches/2020Q3/multimedia/gpac-mp4box/Makefile Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-mp4box/Makefile Sat Aug 1 07:27:04 2020 (r543894)
@@ -2,27 +2,27 @@
# $FreeBSD$
PORTNAME= mp4box
-DISTVERSION= 0.5.0
+DISTVERSIONPREFIX= v
+DISTVERSION= 1.0.0
CATEGORIES= multimedia
-MASTER_SITES= SF/gpac/GPAC/GPAC%20${PORTVERSION}
PKGNAMEPREFIX= gpac-
-DISTNAME= gpac-${DISTVERSION}
MAINTAINER= pvizeli at yahoo.de
COMMENT= Tool for merge mpg4 from Gpac
-BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-05-05
-
LICENSE= LGPL21
LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lgpac
+USES= localbase:ldflags
-WRKSRC= ${WRKDIR}/gpac/applications/mp4box
+USE_GITHUB= yes
+GH_ACCOUNT= gpac
+GH_PROJECT= gpac
+
+LDFLAGS+= -lgpac
+
+WRKSRC_SUBDIR= applications/mp4box
PLIST_FILES= bin/mp4box man/man1/mp4box.1.gz
do-build:
@@ -31,7 +31,7 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mp4box ${STAGEDIR}${PREFIX}/bin/mp4box
- ${INSTALL_MAN} ${WRKSRC}/../../doc/man/mp4box.1 \
+ ${INSTALL_MAN} ${WRKSRC}/../../share/doc/man/mp4box.1 \
${STAGEDIR}${PREFIX}/man/man1/mp4box.1
.include <bsd.port.mk>
Modified: branches/2020Q3/multimedia/gpac-mp4box/distinfo
==============================================================================
--- branches/2020Q3/multimedia/gpac-mp4box/distinfo Sat Aug 1 07:23:40 2020 (r543893)
+++ branches/2020Q3/multimedia/gpac-mp4box/distinfo Sat Aug 1 07:27:04 2020 (r543894)
@@ -1,2 +1,3 @@
-SHA256 (gpac-0.5.0.tar.gz) = 42971ac39511a1b6d1db39af664ce887b38c8657328c88cd200d87a02de81c24
-SIZE (gpac-0.5.0.tar.gz) = 7861057
+TIMESTAMP = 1595078627
+SHA256 (gpac-gpac-v1.0.0_GH0.tar.gz) = ebcca41993e51706c891dba4e9fe03b59bc671c41910bc6c303ba3feeb7f1b20
+SIZE (gpac-gpac-v1.0.0_GH0.tar.gz) = 10289999
More information about the svn-ports-branches
mailing list