[Linphone-users] fix for libmsx264

[Alexander Kozyrev]

============[ fix for libmsx264 ]
much more depend from libmsx264.so

ldd OUTPUT/lib/mediastreamer/plugins/libmsx264.so.0
         linux-gate.so.1 =>  (0xb7782000)
         libpthread.so.0 => /lib/libpthread.so.0 (0xb7549000)
         libdl.so.2 => /lib/libdl.so.2 (0xb7544000)
         libX11.so.6 => /lib/libX11.so.6 (0xb7408000)
         libXv.so.1 => /lib/libXv.so.1 (0xb7402000)
         libXext.so.6 => /lib/libXext.so.6 (0xb73ee000)
         libGL.so.1 => /lib/libGL.so.1 (0xb733c000)
         libGLEW.so.1.9 => /lib/libGLEW.so.1.9 (0xb72d3000)
         libstdc++.so.6 => /lib/libstdc++.so.6 (0xb71e4000)
         libm.so.6 => /lib/libm.so.6 (0xb719d000)
         libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb7180000)
         libc.so.6 => /lib/libc.so.6 (0xb6fc0000)
         /lib/ld-linux.so.2 (0x49906000)
         libxcb.so.1 => /lib/libxcb.so.1 (0xb6f9c000)
         libexpat.so.1 => /lib/libexpat.so.1 (0xb6f73000)
         libglapi.so.0 => /lib/libglapi.so.0 (0xb6f2e000)
         libselinux.so.1 => /lib/libselinux.so.1 (0xb6f0a000)
         libXdamage.so.1 => /lib/libXdamage.so.1 (0xb6f05000)
         libXfixes.so.3 => /lib/libXfixes.so.3 (0xb6eff000)
         libX11-xcb.so.1 => /lib/libX11-xcb.so.1 (0xb6efc000)
         libxcb-glx.so.0 => /lib/libxcb-glx.so.0 (0xb6ee1000)
         libxcb-dri2.so.0 => /lib/libxcb-dri2.so.0 (0xb6edb000)
         libXxf86vm.so.1 => /lib/libXxf86vm.so.1 (0xb6ed4000)
         libdrm.so.2 => /lib/libdrm.so.2 (0xb6ec6000)
         libGLU.so.1 => /lib/libGLU.so.1 (0xb6e50000)
         libXau.so.6 => /lib/libXau.so.6 (0xb6e4c000)
         libpcre.so.1 => /lib/libpcre.so.1 (0xb6de1000)
         liblzma.so.5 => /lib/liblzma.so.5 (0xb6db8000)

fixx for this, there is no need variable MEDIASTREAMER2_LIBRARIES

diff -urNw msx264.orig/src/CMakeLists.txt msx264/src/CMakeLists.txt
--- msx264.orig/src/CMakeLists.txt    Sun Aug 23 11:37:05 2015
+++ msx264/src/CMakeLists.txt    Tue Dec  8 22:39:22 2015
@@ -20,10 +20,7 @@
  #

############################################################################

-set(LIBS
-    ${MEDIASTREAMER2_LIBRARIES}
-    ${X264_LIBRARIES}
-)
+set(LIBS ${X264_LIBRARIES})

  set(SOURCE_FILES msx264.c)


============[ fix for ms2 + ffmpeg build error ]

error while compile

/usr/src/newlinphone/linphone-cmake-builder/OUTPUT/lib/libswscale.a(utils.o): 
In function `sws_init_context':
/usr/src/newlinphone/linphone-cmake-builder/WORK/desktop/Source/EP_ffmpeg/libswscale/utils.c:791:
 
undefined reference to `av_get_cpu_flags'
/usr/src/newlinphone/linphone-cmake-builder/OUTPUT/lib/libswscale.a(swscale.o): 
In function `swScale':
/usr/src/newlinphone/linphone-cmake-builder/WORK/desktop/Source/EP_ffmpeg/libswscale/swscale.c:2588:
 
undefined reference to `av_get_cpu_flags'
collect2: error: ld returned 1 exit status

fix for this, just reorder ffmpeg libs

diff -urNw mediastreamer2.orig/cmake/FindFFMpeg.cmake 
mediastreamer2/cmake/FindFFMpeg.cmake
--- mediastreamer2.orig/cmake/FindFFMpeg.cmake    Thu Jun 18 19:53:18
2015
+++ mediastreamer2/cmake/FindFFMpeg.cmake    Tue Dec  8 22:42:30 2015
@@ -74,8 +74,8 @@
      PATH_SUFFIXES bin lib
  )

-set(FFMPEG_INCLUDE_DIRS ${LIBAVCODEC_INCLUDE_DIRS} 
${LIBAVUTIL_INCLUDE_DIRS} ${LIBSWSCALE_INCLUDE_DIRS})
-set(FFMPEG_LIBRARIES ${LIBAVCODEC_LIBRARIES} ${LIBAVUTIL_LIBRARIES} 
${LIBSWSCALE_LIBRARIES})
+set(FFMPEG_INCLUDE_DIRS ${LIBAVCODEC_INCLUDE_DIRS} 
${LIBSWSCALE_INCLUDE_DIRS} ${LIBAVUTIL_INCLUDE_DIRS})
+set(FFMPEG_LIBRARIES ${LIBAVCODEC_LIBRARIES} ${LIBSWSCALE_LIBRARIES} 
${LIBAVUTIL_LIBRARIES})
  list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
  list(REMOVE_DUPLICATES FFMPEG_LIBRARIES)

============[ fix for ms2 libXext.so missed ]

/usr/bin/ld: 
/usr/src/newlinphone/linphone-cmake-builder/OUTPUT/lib/libmediastreamer_voip.a(x11video.c.o):
 
undefined reference to symbol 'XShmQueryExtension'
/usr/bin/ld: note: 'XShmQueryExtension' is defined in DSO 
/lib/libXext.so.6 so try adding it to the linker command line
/lib/libXext.so.6: could not read symbols: Invalid operation
collect2: error: ld returned 1 exit status


fix for this, add to cmake find the libXext.so

diff -urNw mediastreamer2.orig/cmake/FindXv.cmake 
mediastreamer2/cmake/FindXv.cmake
--- mediastreamer2.orig/cmake/FindXv.cmake    Thu Jun 18 19:53:18 2015
+++ mediastreamer2/cmake/FindXv.cmake    Tue Dec  8 22:43:23 2015
@@ -64,6 +64,12 @@
      PATH_SUFFIXES bin lib
  )

+find_library(XEXT_LIBRARIES
+        NAMES Xext
+        HINTS _Xext_ROOT_PATHS
+        PATH_SUFFIXES bin lib
+)
+
  if(XV_LIBRARIES)
      cmake_push_check_state(RESET)
      list(APPEND CMAKE_REQUIRED_INCLUDES ${XV_INCLUDE_DIRS})
@@ -72,7 +78,7 @@
      cmake_pop_check_state()
  endif()

-set(XV_LIBRARIES ${XV_LIBRARIES} ${X11_LIBRARIES})
+set(XV_LIBRARIES ${XV_LIBRARIES} ${XEXT_LIBRARIES} ${X11_LIBRARIES})
  list(REMOVE_DUPLICATES XV_LIBRARIES)

  include(FindPackageHandleStandardArgs)

=========