diff --git a/build.sh b/build.sh index 2f4b1b7..4de9f24 100755 --- a/build.sh +++ b/build.sh @@ -99,7 +99,7 @@ deps() { ./genMakefiles prudynt-static else echo "SHARED LIVE555" - cp ../../res/live555-config.prudynt ./config.prudynt + patch config.linux-with-shared-libraries ../../res/live555-prudynt.patch --output=./config.prudynt ./genMakefiles prudynt fi diff --git a/res/live555-config.prudynt b/res/live555-config.prudynt deleted file mode 100644 index bed0319..0000000 --- a/res/live555-config.prudynt +++ /dev/null @@ -1,48 +0,0 @@ -# 'CURRENT':'REVISION':'AGE' are updated - whenever a library changes - as follows: -# The library code changes, but without any changes to the API (i.e., interfaces) => increment REVISION -# At least one interface changes, or is removed => CURRENT += 1; REVISION = 0; AGE = 0 -# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1 - -libliveMedia_VERSION_CURRENT=112 -libliveMedia_VERSION_REVISION=4 -libliveMedia_VERSION_AGE=0 -libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION) - -libBasicUsageEnvironment_VERSION_CURRENT=2 -libBasicUsageEnvironment_VERSION_REVISION=4 -libBasicUsageEnvironment_VERSION_AGE=0 -libBasicUsageEnvironment_LIB_SUFFIX=so.$(shell expr $(libBasicUsageEnvironment_VERSION_CURRENT) - $(libBasicUsageEnvironment_VERSION_AGE)).$(libBasicUsageEnvironment_VERSION_AGE).$(libBasicUsageEnvironment_VERSION_REVISION) - -libUsageEnvironment_VERSION_CURRENT=4 -libUsageEnvironment_VERSION_REVISION=0 -libUsageEnvironment_VERSION_AGE=1 -libUsageEnvironment_LIB_SUFFIX=so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION) - -libgroupsock_VERSION_CURRENT=31 -libgroupsock_VERSION_REVISION=13 -libgroupsock_VERSION_AGE=1 -libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION) -##### - -CROSS_COMPILE= $(PRUDYNT_CROSS) -COMPILE_OPTS = $(INCLUDES) -L$(PRUDYNT_ROOT)/3rdparty/install/lib/ -I$(PRUDYNT_ROOT)/3rdparty/install/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNEWLOCALE_NOT_USED -DNO_OPENSSL=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 -fPIC -std=c++20 -PREFIX = $(PRUDYNT_ROOT)/3rdparty/install/ -C = c -C_COMPILER = $(CROSS_COMPILE)gcc -C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS) -CPP = cpp -CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++ -CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS) -OBJ = o -LINK = $(CROSS_COMPILE)g++ -o -LINK_OPTS = -L. $(LDFLAGS) -CONSOLE_LINK_OPTS = $(LINK_OPTS) -LIBRARY_LINK = $(CROSS_COMPILE)gcc -o -LIBRARY_LINK_OPTS = -SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE)) -LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) -LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS) -LIBS_FOR_CONSOLE_APPLICATION = -L$(PRUDYNT_ROOT)/3rdparty/install/lib/ -LIBS_FOR_GUI_APPLICATION = -EXE = -INSTALL2 = install_shared_libraries diff --git a/res/live555-prudynt.patch b/res/live555-prudynt.patch new file mode 100644 index 0000000..918931f --- /dev/null +++ b/res/live555-prudynt.patch @@ -0,0 +1,35 @@ +--- config.linux-with-shared-libraries 2024-09-20 07:18:24.000000000 +0000 +@@ -24,23 +24,25 @@ + libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION) + ##### + +-COMPILE_OPTS = $(INCLUDES) -I/usr/local/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -fPIC ++CROSS_COMPILE= $(PRUDYNT_CROSS) ++COMPILE_OPTS = $(INCLUDES) -L$(PRUDYNT_ROOT)/3rdparty/install/lib/ -I$(PRUDYNT_ROOT)/3rdparty/install/include -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DNEWLOCALE_NOT_USED -DNO_OPENSSL=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 -fPIC -std=c++20 ++PREFIX = $(PRUDYNT_ROOT)/3rdparty/install/ + C = c +-C_COMPILER = $(CC) ++C_COMPILER = $(CROSS_COMPILE)gcc + C_FLAGS = $(COMPILE_OPTS) $(CPPFLAGS) $(CFLAGS) + CPP = cpp +-CPLUSPLUS_COMPILER = $(CXX) ++CPLUSPLUS_COMPILER = $(CROSS_COMPILE)g++ + CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall -DBSD=1 $(CPPFLAGS) $(CXXFLAGS) + OBJ = o +-LINK = $(CXX) -o ++LINK = $(CROSS_COMPILE)g++ -o + LINK_OPTS = -L. $(LDFLAGS) + CONSOLE_LINK_OPTS = $(LINK_OPTS) +-LIBRARY_LINK = $(CC) -o ++LIBRARY_LINK = $(CROSS_COMPILE)gcc -o ++LIBRARY_LINK_OPTS = + SHORT_LIB_SUFFIX = so.$(shell expr $($(NAME)_VERSION_CURRENT) - $($(NAME)_VERSION_AGE)) +-LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) ++LIB_SUFFIX = $(SHORT_LIB_SUFFIX).$($(NAME)_VERSION_AGE).$($(NAME)_VERSION_REVISION) + LIBRARY_LINK_OPTS = -shared -Wl,-soname,$(NAME).$(SHORT_LIB_SUFFIX) $(LDFLAGS) +-LIBS_FOR_CONSOLE_APPLICATION = -lssl -lcrypto ++LIBS_FOR_CONSOLE_APPLICATION = -L$(PRUDYNT_ROOT)/3rdparty/install/lib/ + LIBS_FOR_GUI_APPLICATION = +-LIBS_FOR_LIVEMEDIA_LIB = -lssl -lcrypto + EXE = + INSTALL2 = install_shared_libraries