build.patch

   1 --- mediastreamer-2.16.1/configure.ac~  2017-06-23 10:52:57.000000000 +0200
   2 +++ mediastreamer-2.16.1/configure.ac   2018-09-26 12:03:38.918658108 +0200
   3 @@ -1311,7 +1311,6 @@ AC_SUBST(MS_PUBLIC_CFLAGS)
   4
   5  AC_CONFIG_FILES(
   6         Makefile
   7 -       po/Makefile.in
   8         m4/Makefile
   9         include/Makefile
  10         include/mediastreamer2/Makefile
  11 --- mediastreamer-2.16.1/configure.ac~  2018-09-26 12:17:00.000000000 +0200
  12 +++ mediastreamer-2.16.1/configure.ac   2018-09-26 12:53:27.045356783 +0200
  13 @@ -1,5 +1,5 @@
  14  dnl Process this file with autoconf to produce a configure script.
  15 -AC_INIT([mediastreamer],[2.15.1])
  16 +AC_INIT([mediastreamer],[4.4.2])
  17
  18  AC_MSG_NOTICE([$PACKAGE_NAME-$PACKAGE_VERSION          A mediastreaming library for telephony application.])
  19  AC_MSG_NOTICE([licensed under the terms of the General Public License (GPL)])
  20 --- mediastreamer2-4.4.2/src/Makefile.am.orig   2020-09-24 11:44:00.000000000 +0200
  21 +++ mediastreamer2-4.4.2/src/Makefile.am        2020-09-27 14:14:05.564721694 +0200
  22 @@ -83,6 +83,7 @@
  23                                         base/mswebcam.c \
  24                                         base/mtu.c \
  25                                         base/msasync.c \
  26 +                                       utils/box-plot.c \
  27                                         otherfilters/void.c \
  28                                         otherfilters/itc.c
  29  libmediastreamer_voip_la_SOURCES=
  30 @@ -117,6 +118,8 @@
  31                                         voip/bandwidthcontroller.c \
  32                                         crypto/zrtp.c \
  33                                         voip/stun.c \
  34 +                                       voip/offeranswer.c \
  35 +                                       voip/turn_tcp.cpp \
  36                                         crypto/ms_srtp.c \
  37                                         crypto/dtls_srtp.c \
  38                                         voip/msiframerequestslimiter.c \
  39 @@ -152,6 +155,8 @@
  40                                         utils/g722.h \
  41                                         utils/g722_decode.c \
  42                                         utils/g722_encode.c \
  43 +                                       utils/filter-wrapper/decoding-filter-wrapper.cpp \
  44 +                                       utils/filter-wrapper/encoding-filter-wrapper.cpp \
  45                                         audiofilters/msg722.c \
  46                                         audiofilters/l16.c \
  47                                         audiofilters/genericplc.h \
  48 @@ -257,7 +262,7 @@
  49  libmediastreamer_voip_la_SOURCES+=     videofilters/msv4l2.c
  50  endif
  51
  52 -if BUILD_WIN32 AND NOT(ENABLE_MICROSOFT_STORE_APP)
  53 +if BUILD_WIN32
  54  libmediastreamer_voip_la_SOURCES+=     videofilters/drawdib-display.c
  55  endif
  56
  57 @@ -270,17 +275,16 @@
  58  endif
  59
  60  if BUILD_MATROSKA
  61 -libmediastreamer_voip_la_SOURCES+=     videofilters/mkv.c \
  62 +libmediastreamer_voip_la_SOURCES+=     videofilters/mkv.cpp \
  63                                         utils/mkv_reader.c utils/mkv_reader.h
  64  endif
  65
  66  if BUILD_AVCODEC
  67  libmediastreamer_voip_la_SOURCES+=     videofilters/videoenc.c \
  68                                         videofilters/videodec.c \
  69 -                                       utils/swscale.h \
  70                                         utils/ffmpeg-priv.h \
  71                                         utils/ffmpeg-priv.c \
  72 -                                       videofilters/h264dec.c \
  73 +                                       videofilters/h264dec.cpp \
  74                                         videofilters/ffmpegjpegwriter.c
  75  endif
  76
  77 @@ -303,7 +307,6 @@
  78                                         voip/msvideoqualitycontroller.c \
  79                                         voip/msvideo_neon.c \
  80                                         voip/msvideo_neon.h \
  81 -                                       voip/rfc3984.c \
  82                                         voip/videostarter.c \
  83                                         voip/vp8rtpfmt.c \
  84                                         voip/vp8rtpfmt.h \
  85 @@ -313,10 +316,22 @@
  86                                         utils/bits_rw.c \
  87                                         utils/x11_helper.c \
  88                                         utils/stream_regulator.c utils/stream_regulator.h \
  89 -                                       utils/h264utils.c utils/h264utils.h \
  90                                         voip/layouts.c voip/layouts.h \
  91                                         voip/video_preset_high_fps.c
  92
  93 +libmediastreamer_voip_la_SOURCES+=     voip/h26x/h26x-encoder-filter.cpp \
  94 +                                       voip/h26x/h26x-decoder-filter.cpp \
  95 +                                       voip/h26x/h26x-utils.cpp \
  96 +                                       voip/h26x/h264-nal-packer.cpp \
  97 +                                       voip/h26x/h264-nal-unpacker.cpp \
  98 +                                       voip/h26x/h264-utils.cpp \
  99 +                                       voip/h26x/h265-nal-packer.cpp \
 100 +                                       voip/h26x/h265-nal-unpacker.cpp \
 101 +                                       voip/h26x/h265-utils.cpp \
 102 +                                       voip/h26x/nal-packer.cpp \
 103 +                                       voip/h26x/nal-unpacker.cpp \
 104 +                                       voip/h26x/rfc3984.cpp
 105 +
 106  if ORTP_ENABLED
 107  libmediastreamer_voip_la_SOURCES+=     voip/videostream.c
 108  endif
 109 @@ -468,7 +483,7 @@
 110
 111  AM_OBJCFLAGS=$(AM_CFLAGS)
 112
 113 -imgdir=$(datadir)/images/
 114 +imgdir=$(pkgdatadir)/images/
 115
 116  img_DATA=voip/nowebcamCIF.jpg
 117
 118 --- mediastreamer2-4.4.2/src/base/msfactory.c.orig      2020-09-24 11:44:00.000000000 +0200
 119 +++ mediastreamer2-4.4.2/src/base/msfactory.c   2020-09-26 18:00:06.215992977 +0200
 120 @@ -236,7 +236,7 @@
 121         ms_message("ms_factory_init() done: platform_tags=%s", tags);
 122         ms_free(tags);
 123
 124 -       obj->image_resources_dir = bctbx_strdup_printf("%s/images", PACKAGE_DATA_DIR);
 125 +       obj->image_resources_dir = bctbx_strdup_printf("%s/mediastreamer/images", PACKAGE_DATA_DIR);
 126  }
 127
 128