Changeset 223601 in webkit


Ignore:
Timestamp:
Oct 18, 2017 5:04:10 AM (7 years ago)
Author:
zandobersek@gmail.com
Message:

Remove remnants of OpenWebRTC
​https://bugs.webkit.org/show_bug.cgi?id=178437

Reviewed by Alejandro G. Castro.

.:

Remove the FindOpenWebRTC.cmake file and the searches for it in both
OptionsGTK and OptionsWPE.

  • Source/cmake/FindOpenWebRTC.cmake: Removed.
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsWPE.cmake:

Tools:

Drop OpenWebRTC packages from the GTK's Jhbuild modules file. Relevant
patches are also removed.

  • gtk/jhbuild.modules:
  • gtk/patches/libnice-0001-TURN-allow-REALM-to-be-empty.patch: Removed.
  • gtk/patches/libnice-0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch: Removed.
  • gtk/patches/rtspsrc-timeout-on-udpsrc-is-in-nanoseconds.patch: Removed.
  • gtk/patches/udpsrc-improve-timeouts.patch: Removed.
Location:
trunk
Files:
5 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r223162 r223601  
     12017-10-18  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove remnants of OpenWebRTC
     4        https://bugs.webkit.org/show_bug.cgi?id=178437
     5
     6        Reviewed by Alejandro G. Castro.
     7
     8        Remove the FindOpenWebRTC.cmake file and the searches for it in both
     9        OptionsGTK and OptionsWPE.
     10
     11        * Source/cmake/FindOpenWebRTC.cmake: Removed.
     12        * Source/cmake/OptionsGTK.cmake:
     13        * Source/cmake/OptionsWPE.cmake:
     14
    1152017-10-10  Adrian Perez de Castro  <aperez@igalia.com>
    216

  • trunk/Source/cmake/OptionsGTK.cmake

    r223042 r223601  
    246246endif ()
    247247
    248 if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
    249     find_package(OpenWebRTC)
    250     if (NOT OPENWEBRTC_FOUND)
    251         message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC.")
    252     endif ()
    253     SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
    254 endif ()
    255 
    256248if (ENABLE_SUBTLE_CRYPTO)
    257249    find_package(Libtasn1 REQUIRED)

  • trunk/Source/cmake/OptionsWPE.cmake

    r223162 r223601  
    8181SET_AND_EXPOSE_TO_BUILD(USE_GCRYPT TRUE)
    8282
    83 if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
    84     find_package(OpenWebRTC)
    85     if (NOT OPENWEBRTC_FOUND)
    86         message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC.")
    87     endif ()
    88     SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
    89 endif ()
    90 
    9183if (ENABLE_ACCELERATED_2D_CANVAS)
    9284    find_package(CairoGL 1.10.2 REQUIRED COMPONENTS cairo-egl)

  • trunk/Tools/ChangeLog

    r223572 r223601  
     12017-10-18  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        Remove remnants of OpenWebRTC
     4        https://bugs.webkit.org/show_bug.cgi?id=178437
     5
     6        Reviewed by Alejandro G. Castro.
     7
     8        Drop OpenWebRTC packages from the GTK's Jhbuild modules file. Relevant
     9        patches are also removed.
     10
     11        * gtk/jhbuild.modules:
     12        * gtk/patches/libnice-0001-TURN-allow-REALM-to-be-empty.patch: Removed.
     13        * gtk/patches/libnice-0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch: Removed.
     14        * gtk/patches/rtspsrc-timeout-on-udpsrc-is-in-nanoseconds.patch: Removed.
     15        * gtk/patches/udpsrc-improve-timeouts.patch: Removed.
     16
    1172017-10-17  Jonathan Bedard  <jbedard@apple.com>
    218

  • trunk/Tools/gtk/jhbuild.modules

    r223042 r223601  
    2727      <dep package="atk"/>
    2828      <dep package="webkit-gstreamer-testing-dependencies"/>
    29       <dep package="openwebrtc"/>
    3029      <dep package="pango"/>
    3130      <dep package="llvm"/>
    … …  
    408407  </autotools>
    409408
    410   <autotools id="libusrsctp" supports-non-srcdir-builds="no" autogen-sh="./bootstrap; ./configure --disable-warnings-as-errors">
    411     <branch repo="github.com" module="sctplab/usrsctp.git" checkoutdir="usrsctp" tag="078ff3252f73327e0ac11d6fd5eff62011f6646e"/>
    412   </autotools>
    413 
    414    <autotools id="gst-plugins-openwebrtc" supports-parallel-builds="no" supports-non-srcdir-builds="no" autogen-sh="./autogen.sh; ./configure">
    415      <dependencies>
    416        <dep package="gst-plugins-base"/>
    417        <dep package="libusrsctp"/>
    418      </dependencies>
    419     <branch repo="github.com" module="Igalia/openwebrtc-gst-plugins.git" checkoutdir="gst-plugins-openwebrtc" tag="9b2199ea970369dbf1d9ca2f8e61c95f21db2b6e"/>
    420    </autotools>
    421 
    422    <autotools id="libnice"
    423               supports-non-srcdir-builds="no">
    424     <dependencies>
    425       <dep package="gstreamer"/>
    426     </dependencies>
    427     <branch module="libnice/libnice/archive/${version}.tar.gz" version="2803a0b4b70af9684e05ef5ed3f0c2fbca4b6c93"
    428             checkoutdir="libnice-${version}" repo="github-tarball">
    429       <patch file="libnice-0001-nicesrc-spin-the-agent-mainloop-in-a-separate-thread.patch" strip="1"/>
    430       <patch file="libnice-0001-TURN-allow-REALM-to-be-empty.patch" strip="1"/>
    431     </branch>
    432   </autotools>
    433 
    434   <autotools id="openwebrtc" autogenargs="--enable-bridge=no --enable-owr-gst=yes">
    435     <dependencies>
    436       <dep package="gst-plugins-openwebrtc"/>
    437       <dep package="gst-plugins-bad"/>
    438       <dep package="libnice"/>
    439      </dependencies>
    440     <branch repo="github.com" module="Igalia/openwebrtc.git" checkoutdir="openwebrtc" tag="7f3d23e034818893db198f4b56e41609abd8847b"/>
    441   </autotools>
    442 
    443409  <autotools id="llvm"
    444410             autogen-sh="configure"
Note: See TracChangeset for help on using the changeset viewer.