diff options
Diffstat (limited to 'third-party/pjproject/patches/0000-remove-third-party.patch')
| -rw-r--r-- | third-party/pjproject/patches/0000-remove-third-party.patch | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/third-party/pjproject/patches/0000-remove-third-party.patch b/third-party/pjproject/patches/0000-remove-third-party.patch index 2e3bb5f9f..81c53a0c3 100644 --- a/third-party/pjproject/patches/0000-remove-third-party.patch +++ b/third-party/pjproject/patches/0000-remove-third-party.patch @@ -1,21 +1,14 @@ diff --git a/build.mak.in b/build.mak.in -index 802211c..25fd05e 100644 +index eb28663..83024ef 100644 --- a/build.mak.in +++ b/build.mak.in -@@ -1,4 +1,3 @@ +@@ -1,6 +1,5 @@ -export PJDIR := @ac_pjdir@ include $(PJDIR)/version.mak export PJ_DIR := $(PJDIR) -@@ -9,7 +8,7 @@ export HOST_NAME := unix - export CC_NAME := gcc - export TARGET_NAME := @target@ - export CROSS_COMPILE := @ac_cross_compile@ --export LINUX_POLL := @ac_linux_poll@ -+export LINUX_POLL := @ac_linux_poll@ - export SHLIB_SUFFIX := @ac_shlib_suffix@ - - export prefix := @prefix@ + # @configure_input@ + export MACHINE_NAME := auto @@ -28,19 +27,6 @@ export APP_THIRD_PARTY_EXT := export APP_THIRD_PARTY_LIBS := export APP_THIRD_PARTY_LIB_FILES := @@ -36,7 +29,7 @@ index 802211c..25fd05e 100644 ifeq (@ac_pjmedia_resample@,libresample) APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) ifeq ($(PJ_SHARED_LIBRARIES),) -@@ -57,85 +43,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI +@@ -57,99 +43,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI endif endif @@ -118,25 +111,21 @@ index 802211c..25fd05e 100644 -endif -endif - +-ifneq (@ac_no_webrtc@,1) +-ifeq (@ac_external_webrtc@,1) +-APP_THIRD_PARTY_EXT += -lwebrtc +-else +-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-$(LIB_SUFFIX) +-ifeq ($(PJ_SHARED_LIBRARIES),) +-APP_THIRD_PARTY_LIBS += -lwebrtc-$(TARGET_NAME) +-else +-APP_THIRD_PARTY_LIBS += -lwebrtc +-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX) +-endif +-endif +-endif +- - # Additional flags @ac_build_mak_vars@ -@@ -149,7 +56,7 @@ SDL_CFLAGS = @ac_sdl_cflags@ - SDL_LDFLAGS = @ac_sdl_ldflags@ - - # FFMPEG flags --FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ -+FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ - FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@ - - # Video4Linux2 -@@ -157,7 +64,7 @@ V4L2_CFLAGS = @ac_v4l2_cflags@ - V4L2_LDFLAGS = @ac_v4l2_ldflags@ - - # OPENH264 flags --OPENH264_CFLAGS = @ac_openh264_cflags@ -+OPENH264_CFLAGS = @ac_openh264_cflags@ - OPENH264_LDFLAGS = @ac_openh264_ldflags@ - - # QT |