From d028b69503d5d37e7ef3a091db46e4e7f1232e4e Mon Sep 17 00:00:00 2001 From: Lukas Rucka Date: Wed, 1 Aug 2018 14:09:49 +0200 Subject: [PATCH] Rename ultragrid modules to ultragrid_* instead of module_* --- configure.ac | 4 +- .../ultragrid-nightly.spec.tpl | 84 +++++++++---------- src/host.cpp | 2 +- src/lib_common.cpp | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index 75556a739..c478f4b97 100644 --- a/configure.ac +++ b/configure.ac @@ -227,7 +227,7 @@ static inline int posix_memalign(void **memptr, size_t alignment, size_t size) # @param $2 object files # @param $3 libraries AC_DEFUN([ADD_MODULE], [ - TARGET="lib/ultragrid/module_"$1".so" + TARGET="lib/ultragrid/ultragrid_"$1".so" LIB_OBJS=$LIB_OBJS" "$2 LIB_MODULES=$LIB_MODULES" "$3 AM_CONDITIONAL([IS_TARGET], [test x$1 != x]) @@ -236,7 +236,7 @@ AC_DEFUN([ADD_MODULE], [ MODULES="$MODULES $TARGET" TARGETS="$TARGETS $TARGET: "$2" - \$(LINKER) \$(LDFLAGS) -shared -Wl,-soname,module_"$1.so" "$2" -o lib/ultragrid/module_"$1".so "$3" + \$(LINKER) \$(LDFLAGS) -shared -Wl,-soname,ultragrid_"$1.so" "$2" -o lib/ultragrid/ultragrid_"$1".so "$3" " ]) ]) diff --git a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl index de1e3ec96..4f11c5820 100644 --- a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl +++ b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl @@ -237,65 +237,65 @@ sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E %{_bindir}/hd-rum-transcode %if 0%{?build_gui} > 0 %{_bindir}/uv-qt -%{_libdir}/ultragrid/module_display_preview.so +%{_libdir}/ultragrid/ultragrid_display_preview.so %endif %dir %{_libdir}/ultragrid %if 0%{?build_dvs} > 0 -%{_libdir}/ultragrid/module_vidcap_dvs.so -%{_libdir}/ultragrid/module_display_dvs.so +%{_libdir}/ultragrid/ultragrid_vidcap_dvs.so +%{_libdir}/ultragrid/ultragrid_display_dvs.so %endif %if 0%{?build_blackmagick} > 0 -%{_libdir}/ultragrid/module_vidcap_decklink.so -%{_libdir}/ultragrid/module_display_decklink.so -%{_libdir}/ultragrid/module_aplay_decklink.so +%{_libdir}/ultragrid/ultragrid_vidcap_decklink.so +%{_libdir}/ultragrid/ultragrid_display_decklink.so +%{_libdir}/ultragrid/ultragrid_aplay_decklink.so %endif %if 0%{?build_bluefish} > 0 -%{_libdir}/ultragrid/module_vidcap_bluefish444.so -%{_libdir}/ultragrid/module_display_bluefish444.so +%{_libdir}/ultragrid/ultragrid_vidcap_bluefish444.so +%{_libdir}/ultragrid/ultragrid_display_bluefish444.so %endif %if 0%{?build_aja} > 0 -%{_libdir}/ultragrid/module_vidcap_aja.so +%{_libdir}/ultragrid/ultragrid_vidcap_aja.so %endif %if 0%{?build_deltacast} > 0 -%{_libdir}/ultragrid/module_vidcap_deltacast.so -%{_libdir}/ultragrid/module_display_deltacast.so +%{_libdir}/ultragrid/ultragrid_vidcap_deltacast.so +%{_libdir}/ultragrid/ultragrid_display_deltacast.so %endif -%{_libdir}/ultragrid/module_display_sdl.so +%{_libdir}/ultragrid/ultragrid_display_sdl.so # rtsp is broken with current live555 -#{_libdir}/ultragrid/module_vidcap_rtsp.so -#{_libdir}/ultragrid/module_video_rxtx_h264.so -%{_libdir}/ultragrid/module_vcapfilter_resize.so -%{_libdir}/ultragrid/module_vcapfilter_blank.so -%{_libdir}/ultragrid/module_vidcap_testcard.so -%{_libdir}/ultragrid/module_display_gl.so -%{_libdir}/ultragrid/module_vidcap_swmix.so +#{_libdir}/ultragrid/ultragrid_vidcap_rtsp.so +#{_libdir}/ultragrid/ultragrid_video_rxtx_h264.so +%{_libdir}/ultragrid/ultragrid_vcapfilter_resize.so +%{_libdir}/ultragrid/ultragrid_vcapfilter_blank.so +%{_libdir}/ultragrid/ultragrid_vidcap_testcard.so +%{_libdir}/ultragrid/ultragrid_display_gl.so +%{_libdir}/ultragrid/ultragrid_vidcap_swmix.so # Fedora 25 OpenCV3 %if 0%{?build_conference} > 0 -%{_libdir}/ultragrid/module_display_video_mix.so +%{_libdir}/ultragrid/ultragrid_display_video_mix.so %endif -%{_libdir}/ultragrid/module_vidcap_screen.so -%{_libdir}/ultragrid/module_vcompress_rtdxt.so -%{_libdir}/ultragrid/module_vdecompress_rtdxt.so -%{_libdir}/ultragrid/module_vcompress_uyvy.so -%{_libdir}/ultragrid/module_acap_portaudio.so -%{_libdir}/ultragrid/module_aplay_portaudio.so -%{_libdir}/ultragrid/module_acap_jack.so -%{_libdir}/ultragrid/module_aplay_jack.so -%{_libdir}/ultragrid/module_acap_alsa.so -%{_libdir}/ultragrid/module_aplay_alsa.so -%{_libdir}/ultragrid/module_vo_pp_scale.so -%{_libdir}/ultragrid/module_vo_pp_text.so -%{_libdir}/ultragrid/module_vidcap_v4l2.so -%{_libdir}/ultragrid/module_vcompress_libavcodec.so -%{_libdir}/ultragrid/module_vdecompress_libavcodec.so -%{_libdir}/ultragrid/module_acompress_libavcodec.so -%{_libdir}/ultragrid/module_openssl.so +%{_libdir}/ultragrid/ultragrid_vidcap_screen.so +%{_libdir}/ultragrid/ultragrid_vcompress_rtdxt.so +%{_libdir}/ultragrid/ultragrid_vdecompress_rtdxt.so +%{_libdir}/ultragrid/ultragrid_vcompress_uyvy.so +%{_libdir}/ultragrid/ultragrid_acap_portaudio.so +%{_libdir}/ultragrid/ultragrid_aplay_portaudio.so +%{_libdir}/ultragrid/ultragrid_acap_jack.so +%{_libdir}/ultragrid/ultragrid_aplay_jack.so +%{_libdir}/ultragrid/ultragrid_acap_alsa.so +%{_libdir}/ultragrid/ultragrid_aplay_alsa.so +%{_libdir}/ultragrid/ultragrid_vo_pp_scale.so +%{_libdir}/ultragrid/ultragrid_vo_pp_text.so +%{_libdir}/ultragrid/ultragrid_vidcap_v4l2.so +%{_libdir}/ultragrid/ultragrid_vcompress_libavcodec.so +%{_libdir}/ultragrid/ultragrid_vdecompress_libavcodec.so +%{_libdir}/ultragrid/ultragrid_acompress_libavcodec.so +%{_libdir}/ultragrid/ultragrid_openssl.so %if 0%{?cuda} > 0 -%{_libdir}/ultragrid/module_vcompress_jpeg.so -%{_libdir}/ultragrid/module_vdecompress_jpeg.so -%{_libdir}/ultragrid/module_vcompress_cuda_dxt.so -%{_libdir}/ultragrid/module_vdecompress_jpeg_to_dxt.so -%{_libdir}/ultragrid/module_ldgm_gpu.so +%{_libdir}/ultragrid/ultragrid_vcompress_jpeg.so +%{_libdir}/ultragrid/ultragrid_vdecompress_jpeg.so +%{_libdir}/ultragrid/ultragrid_vcompress_cuda_dxt.so +%{_libdir}/ultragrid/ultragrid_vdecompress_jpeg_to_dxt.so +%{_libdir}/ultragrid/ultragrid_ldgm_gpu.so # cudart %{_libdir}/ultragrid/*cudart* %endif diff --git a/src/host.cpp b/src/host.cpp index 1cc6cfb98..25c8fa4e1 100644 --- a/src/host.cpp +++ b/src/host.cpp @@ -173,7 +173,7 @@ bool common_preinit(int argc, char *argv[]) } #endif - open_all("module_*.so"); // load modules + open_all("ultragrid_*.so"); // load modules #ifdef USE_MTRACE mtrace(); diff --git a/src/lib_common.cpp b/src/lib_common.cpp index 4bd1af435..298b72171 100644 --- a/src/lib_common.cpp +++ b/src/lib_common.cpp @@ -272,7 +272,7 @@ const void *load_library(const char *name, enum library_class cls, int abi_versi // Library was not found or was not loaded due to unsatisfied // dependencies. If the latter one, display reason why dlopen() failed. if (library_class_info.find(cls) != library_class_info.end()) { - string filename = "module_"; + string filename = "ultragrid_"; if (strlen(library_class_info.at(cls).file_prefix) > 0) { filename += library_class_info.at(cls).file_prefix; filename += "_";