breeze/gpac
1
0
Fork 0
mirror of https://github.com/gpac/gpac.git synced 2026-01-12 00:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove share/vis for share/rmtws + cov build fix

Browse Source
This commit is contained in:
Aurelien David
2025-04-10 10:27:12 +02:00
parent 279bebc1a7
commit 28146a2642
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -194,7 +194,7 @@ endif
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/scripts"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/python"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/vis"
$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/rmtws"
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/default.cfg $(DESTDIR)$(prefix)/share/gpac/
ifneq ($(CONFIG_DARWIN),yes)
@@ -217,7 +217,7 @@ ifeq ($(CONFIG_DARWIN),yes)
cp -R $(SRC_PATH)/share/scripts/* "$(DESTDIR)$(prefix)/share/gpac/scripts/"
cp -R $(SRC_PATH)/share/python/* "$(DESTDIR)$(prefix)/share/gpac/python/"
cp $(SRC_PATH)/share/res/* "$(DESTDIR)$(prefix)/share/gpac/res/"
cp -R $(SRC_PATH)/share/vis/* "$(DESTDIR)$(prefix)/share/gpac/vis/"
cp -R $(SRC_PATH)/share/rmtws/* "$(DESTDIR)$(prefix)/share/gpac/rmtws/"
else
cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/gui/icons/* $(DESTDIR)$(prefix)/share/gpac/gui/icons/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/gui/extensions/* $(DESTDIR)$(prefix)/share/gpac/gui/extensions/
@@ -225,7 +225,7 @@ else
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/scripts/* $(DESTDIR)$(prefix)/share/gpac/scripts/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/python/* $(DESTDIR)$(prefix)/share/gpac/python/
cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/res/* $(DESTDIR)$(prefix)/share/gpac/res/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/vis/* $(DESTDIR)$(prefix)/share/gpac/vis/
cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/share/rmtws/* $(DESTDIR)$(prefix)/share/gpac/rmtws/
endif
lninstall:

1
applications/gpac/gpac.c
View File

@@ -3381,7 +3381,6 @@ static u32 gpac_unit_tests(GF_MemTrackerType mem_track)
u32 size;
burl = gf_blob_register(&b);
gf_sys_profiler_set_callback(NULL, NULL);
gf_blob_get(burl, &data, &size, NULL);
gf_blob_unregister(&b);

2
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
gpac (2.5-DEV) stable; urgency=low
gpac (2.5-DEV-rev1391-g7b1341d77-buildbot-rmtws) stable; urgency=low
* Initial release - see https://github.com/gpac/gpac/releases for more details

2
mkdmg.sh
View File

@@ -69,7 +69,7 @@ cd ../../../..
echo Copying shared resources
rsync -r --exclude=.git $source_path/share/res ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/gui ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/vis ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/rmtws ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/shaders ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/scripts ./tmpdmg/GPAC.app/Contents/MacOS/share/
rsync -r --exclude=.git $source_path/share/python ./tmpdmg/GPAC.app/Contents/MacOS/share/

4
packagers/win32_64/nsis/gpac_installer.nsi
View File

@@ -262,6 +262,10 @@ Section "GPAC Core" SecGPAC
SetOutPath $INSTDIR\share\lang
File /r /x .git ${GPAC_ROOT}\share\lang\*
;copy rmtws
SetOutPath $INSTDIR\share\rmtws
File /r /x .git ${GPAC_ROOT}\share\rmtws\*
;create default cache
SetOutPath $INSTDIR\cache
SetOutPath $INSTDIR

8
src/filter_core/filter_session_js.c
View File

@@ -160,14 +160,6 @@ static void jsfs_exec_task_custom(JSFS_Task *task, const char *text, GF_Filter *
gf_js_lock(task->ctx, GF_FALSE);
}
static void jsfs_rmt_user_callback(void *udta, const char* text)
{
JSFS_Task *task = udta;
if (!task) return;
jsfs_exec_task_custom(task, text, NULL, NULL);
}
//// RMTClient js class ////
static JSClassID jsfs_rmt_client_class_id;