From 1a359897a80a49376b55bc0bb91485a80251da99 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 18 Jul 2020 20:52:24 +0000 Subject: [PATCH] Update to upstream version 1.0.0 PR: 245932 Submitted by: shoesoft@gmx.net Reviewed by: riggs --- multimedia/gpac-libgpac/Makefile | 15 ++++--- multimedia/gpac-libgpac/distinfo | 5 ++- .../files/patch-export-x264-symbols | 28 ------------- .../files/patch-src-utils-os_config_init.c | 39 +++++++++---------- .../files/patch-src-utils-os_divers.c | 6 +-- .../files/patch-src_quickjs_quickjs.c | 29 ++++++++++++++ multimedia/gpac-libgpac/pkg-plist | 32 ++++++++------- 7 files changed, 80 insertions(+), 74 deletions(-) delete mode 100644 multimedia/gpac-libgpac/files/patch-export-x264-symbols create mode 100644 multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile index d60185ae615e..44cc57f9813e 100644 --- a/multimedia/gpac-libgpac/Makefile +++ b/multimedia/gpac-libgpac/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= gpac -PORTVERSION= 0.5.0 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.0.0 PORTEPOCH= 1 CATEGORIES= multimedia -MASTER_SITES= SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION} PKGNAMESUFFIX= -libgpac MAINTAINER= multimedia@FreeBSD.org @@ -14,10 +13,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 diff --git a/multimedia/gpac-libgpac/distinfo b/multimedia/gpac-libgpac/distinfo index 699d7aba38d2..81e63cd04359 100644 --- a/multimedia/gpac-libgpac/distinfo +++ b/multimedia/gpac-libgpac/distinfo @@ -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 diff --git a/multimedia/gpac-libgpac/files/patch-export-x264-symbols b/multimedia/gpac-libgpac/files/patch-export-x264-symbols deleted file mode 100644 index cbed8dab042f..000000000000 --- a/multimedia/gpac-libgpac/files/patch-export-x264-symbols +++ /dev/null @@ -1,28 +0,0 @@ ---- src/isomedia/avc_ext.c.orig 2012-03-27 13:48:05.000000000 +0400 -+++ src/isomedia/avc_ext.c 2013-03-12 01:00:39.595690860 +0400 -@@ -170,6 +170,7 @@ - - - #ifndef GPAC_DISABLE_ISOM_WRITE -+GF_EXPORT - GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex) - { - GF_TrackBox *trak; ---- src/isomedia/isom_write.c.orig 2012-03-29 16:36:23.000000000 +0400 -+++ src/isomedia/isom_write.c 2013-03-12 01:00:39.605699394 +0400 -@@ -1140,6 +1140,7 @@ - return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL); - } - -+GF_EXPORT - GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height) - { - GF_Err e; -@@ -1187,6 +1188,7 @@ - } - } - -+GF_EXPORT - GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing) - { - GF_Err e; diff --git a/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c b/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c index d8ec969552ac..66e0901421fa 100644 --- a/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c +++ b/multimedia/gpac-libgpac/files/patch-src-utils-os_config_init.c @@ -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 @@ -8,32 +8,29 @@ +#include +#include #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; - } diff --git a/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c b/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c index 3f87ed19c792..9f1e47a90965 100644 --- a/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c +++ b/multimedia/gpac-libgpac/files/patch-src-utils-os_divers.c @@ -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; } diff --git a/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c b/multimedia/gpac-libgpac/files/patch-src_quickjs_quickjs.c new file mode 100644 index 000000000000..54e016d9ce30 --- /dev/null +++ b/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 + #elif defined(__linux__) || defined(__NX__) + #include ++#elif defined(__FreeBSD__) ++#include + #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 */ diff --git a/multimedia/gpac-libgpac/pkg-plist b/multimedia/gpac-libgpac/pkg-plist index 02e3cefb68bf..f7f50878be54 100644 --- a/multimedia/gpac-libgpac/pkg-plist +++ b/multimedia/gpac-libgpac/pkg-plist @@ -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