Date: Wed, 30 Dec 2015 17:45:33 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404875 - in head: multimedia/obs-studio multimedia/obs-studio/files textproc/sigil x11/antimicro Message-ID: <201512301745.tBUHjXw1059664@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Wed Dec 30 17:45:32 2015 New Revision: 404875 URL: https://svnweb.freebsd.org/changeset/ports/404875 Log: Finish fixing broken ports after r404856 and r404694. * multimedia/obs-studio: Import some upstream commits that pass all required include directories to the compiler and reference libsysinfo.so with a full path instead of passing -lsysinfo and relying on ${LOCALBASE}/lib being in the linker search path. * textproc/sigil: Pass LDFLAGS+=${LOCALBASE}/lib for now to work around the fact that upstream's build system references libhunspell-1.3.so and libpcre16.so without full paths (instead of finding them with the proper CMake commands it relies on pkg-config's output). * x11/antimicro: Also pass LDFLAGS+=${LOCALBASE}/lib for now to work around the fact that several X11 and SDL2 libraries are referenced without full paths. I sent a pull request upstream to fix the X11 references, but SDL2 is still detected through pkg-config. MFH: 2015Q4 Added: head/multimedia/obs-studio/files/patch-git_4bdb45a8 (contents, props changed) head/multimedia/obs-studio/files/patch-git_5983b506 (contents, props changed) Modified: head/multimedia/obs-studio/Makefile head/textproc/sigil/Makefile head/x11/antimicro/Makefile Modified: head/multimedia/obs-studio/Makefile ============================================================================== --- head/multimedia/obs-studio/Makefile Wed Dec 30 17:39:23 2015 (r404874) +++ head/multimedia/obs-studio/Makefile Wed Dec 30 17:45:32 2015 (r404875) @@ -27,7 +27,7 @@ USE_GL+= gl USE_QT5= core dbus gui opengl network svg multimedia \ imageformats buildtools qmake x11extras CFLAGS+= -fPIC -LDFLAGS+= -lsysinfo +LDFLAGS+= ${LOCALBASE}/lib/libsysinfo.so USES= cmake compiler:c11 CMAKE_ARGS+= -DUNIX_STRUCTURE=1 \ -DOBS_VERSION_OVERRIDE=${PORTVERSION} Added: head/multimedia/obs-studio/files/patch-git_4bdb45a8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/obs-studio/files/patch-git_4bdb45a8 Wed Dec 30 17:45:32 2015 (r404875) @@ -0,0 +1,25 @@ +commit 4bdb45a8acfee805c715ca8ccf3cf74aac1a5223 +Author: fryshorts <leonhard@in-verted.de> +Date: Sun May 3 17:09:29 2015 +0200 + + linux-v4l2: Add include directory to cmake + + Add the include directories found by cmake to the v4l2 plugin. + This allows for the plugin to compile when the vl42 headers were + found in a directory that is not normally in the search path of the + compiler (e.g. /usr/local/include) + +--- plugins/linux-v4l2/CMakeLists.txt ++++ plugins/linux-v4l2/CMakeLists.txt +@@ -24,6 +24,11 @@ else() + add_definitions(-DHAVE_UDEV) + endif() + ++include_directories( ++ SYSTEM "${CMAKE_SOURCE_DIR}/libobs" ++ ${LIBV4L2_INCLUDE_DIRS} ++) ++ + set(linux-v4l2_SOURCES + linux-v4l2.c + v4l2-input.c Added: head/multimedia/obs-studio/files/patch-git_5983b506 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/obs-studio/files/patch-git_5983b506 Wed Dec 30 17:45:32 2015 (r404875) @@ -0,0 +1,25 @@ +commit 5983b506e9a692a00987d86a60390028d3ad73ce +Author: fryshorts <leonhard@in-verted.de> +Date: Sun May 3 17:01:09 2015 +0200 + + linux-pulseaudio: Add include directory to cmake + + Add the include directories found by cmake to the pulseaudio plugin. + This allows for the plugin to compile when the pulseaudio headers were + found in a directory that is not normally in the search path of the + compiler (e.g. /usr/local/include) + +--- plugins/linux-pulseaudio/CMakeLists.txt ++++ plugins/linux-pulseaudio/CMakeLists.txt +@@ -13,7 +13,10 @@ elseif(NOT PULSEAUDIO_FOUND) + return() + endif() + +-include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs") ++include_directories( ++ SYSTEM "${CMAKE_SOURCE_DIR}/libobs" ++ ${PULSEAUDIO_INCLUDE_DIR} ++) + + set(linux-pulseaudio_SOURCES + linux-pulseaudio.c Modified: head/textproc/sigil/Makefile ============================================================================== --- head/textproc/sigil/Makefile Wed Dec 30 17:39:23 2015 (r404874) +++ head/textproc/sigil/Makefile Wed Dec 30 17:45:32 2015 (r404875) @@ -18,6 +18,11 @@ USE_GITHUB= yes GH_ACCOUNT= Sigil-Ebook GH_PROJECT= Sigil +# Upstream uses pkg-config output to pass libhunspell-1.3.so and +# libpcre16.so to the linker. pkg-config output does not include full +# paths, so add a workaround to keep the port linking for now. +LDFLAGS+= -L${LOCALBASE}/lib + USES= cmake compiler:c++11-lib desktop-file-utils pkgconfig \ python:3 shebangfix SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ Modified: head/x11/antimicro/Makefile ============================================================================== --- head/x11/antimicro/Makefile Wed Dec 30 17:39:23 2015 (r404874) +++ head/x11/antimicro/Makefile Wed Dec 30 17:45:32 2015 (r404875) @@ -13,6 +13,11 @@ LICENSE= GPLv3 USE_GITHUB= yes GH_ACCOUNT= Ryochan7 +# Upstream assumes ${LOCALBASE}/lib is part of the default linker path. Pull +# request 268 fixes it for X11 libraries, but SDL2 is still using pkg-config +# output (without full paths). +LDFLAGS+= ${LOCALBASE}/lib + USE_XORG= x11 xtst USE_QT5= linguisttools_build qmake_build buildtools_build widgets network USE_SDL= sdl2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512301745.tBUHjXw1059664>