CVS commit: pkgsrc/multimedia/obs-studio

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/obs-studio
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Thu, 3 Oct 2019 20:33:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Oct  3 20:33:15 UTC 2019

Modified Files:
        pkgsrc/multimedia/obs-studio: Makefile PLIST PLIST.Linux PLIST.NetBSD
            distinfo
        pkgsrc/multimedia/obs-studio/patches: patch-libobs_graphics_graphics.h
            patch-libobs_obs-nix.c patch-plugins_obs-outputs_net-if.h

Log Message:
obs-studio: Update to 24.0.1

24.0.1 Hotfix

    Browser sources will now have their pre-24.0 audio behavior by default; to use OBS to control the browser source audio, users must now use the "Control Audio via OBS" option in the browser source 
properties. This change was made as a safety precaution because it changed user configurations compared with how the browser audio used to function, which confused some users.
    Fixed an issue where certain cameras (particularly C920 cameras) would output with a lot of delay depending on the drivers installed
    Fixed a crash on startup
    Fixed a crash that would happen when closing the Mixer chat window

24.0 New Features

    Added the ability to pause while recording to allow seamless on-the-fly removal of video segments. This can only be used when not sharing an encoder with the stream. [Jim]
    Added an option to automatically adjust bitrate when congestion occurs to advanced settings, which is an alternative to dropping frames (available in advanced settings). Note that this currently 
only works with RTMP, and severe congestion may cause increased delay to viewers. [Jim/pkv]
    Added the ability to select multiple sources on the preview by box selection [Dillon]
    Added the ability to create custom browser docks in the View -> Docks menu. This allows you to open extra dockable webpages whenever OBS opens [Jim]
    Browser sources can now have their volume adjusted via the audio mixer, or have filters applied to them. Additionally, you can now change whether the browser source outputs to speakers or to 
stream only via the audio monitoring settings in advanced audio properties. [Osiris/pkv/Jim]
    Added a script to pause recording when a specific scene is active [cg2121]
    Added a "Hotkey Focus Behavior" option to advanced settings, which allows you to set whether hotkeys are disabled depending on whether you have the main window in focus or not [jb-alvarado/Jim]
    Added an option to general settings to allow users to confirm when clicking the "Stop Recording" button [glikely]
    Added channels widget for restream.io service integration [SoftwareArchitector]
    Added the "Area" shader as a downscale shader in video settings [jpark37]
    Added an "Enable Preview" button to the main window when the preview is disabled [cg2121]
    Added (or rather fixed) hardware acceleration support for decoding media files when using the media source where applicable [Jim]

24.0 Tweaks/Fixes

    Updated all dependencies on Windows (such as FFmpeg, x264, CEF) to their latest versions [Jim]
    Made a number of optimizations and performance improvements [jpark37]
    Made a number of performance improvements to QSV [brittneysclark]
    Changed default recording format to mkv instead of flv [WizardCM]
    Recording now automatically stop if there is less than 50 megabytes left of disk space available [cg2121]
    Fixed a number of issues with Linux window capture [kkartaltepe]
    Fixed the tray icon showing up on startup even when it was turned off [Jim]
    Fixed a bug where encoders could lock up when an encode call fails [Jim]
    Fixed an issue where projectors would have a gray background rather than a black background [Jim]
    Fixed a bug where secondary Twitch/Mixer browser panels would stop appearing [Jim]
    Fixed a freeze that could happen under rare circumstances when shutting down [Jim]
    If no tracks are selected when recording in advanced output mode, it will now default to the same track being used for streaming [cg2121]


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/obs-studio/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/obs-studio/PLIST \
    pkgsrc/multimedia/obs-studio/PLIST.NetBSD \
    pkgsrc/multimedia/obs-studio/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/obs-studio/PLIST.Linux
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h \
    pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c \
    pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/obs-studio/Makefile
diff -u pkgsrc/multimedia/obs-studio/Makefile:1.5 pkgsrc/multimedia/obs-studio/Makefile:1.6
--- pkgsrc/multimedia/obs-studio/Makefile:1.5   Wed Sep 18 14:17:14 2019
+++ pkgsrc/multimedia/obs-studio/Makefile       Thu Oct  3 20:33:15 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2019/09/18 14:17:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2019/10/03 20:33:15 nia Exp $
 
-DISTNAME=      obs-studio-23.2.1
-PKGREVISION=   4
+DISTNAME=      obs-studio-24.0.1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=obsproject/}
 
@@ -17,7 +16,7 @@ USE_LANGUAGES=        c gnu++11
 CMAKE_ARGS+=   -DDISABLE_LIBFDK=BOOL:ON
 CMAKE_ARGS+=   -DDISABLE_VLC=BOOL:ON
 
-DEPENDS+=      swig3>=3.0:../../devel/swig3
+TOOL_DEPENDS+= swig3>=3.0:../../devel/swig3
 
 # Python 3 only
 PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/multimedia/obs-studio/PLIST
diff -u pkgsrc/multimedia/obs-studio/PLIST:1.1 pkgsrc/multimedia/obs-studio/PLIST:1.2
--- pkgsrc/multimedia/obs-studio/PLIST:1.1      Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/PLIST  Thu Oct  3 20:33:15 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/06/30 21:01:24 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/03 20:33:15 nia Exp $
 bin/obs
 bin/obs-ffmpeg-mux
 include/obs/audio-monitoring/pulse/pulseaudio-wrapper.h
@@ -139,6 +139,7 @@ share/obs/libobs/premultiplied_alpha.eff
 share/obs/libobs/repeat.effect
 share/obs/libobs/solid.effect
 share/obs/obs-plugins/decklink-ouput-ui/.keepme
+share/obs/obs-plugins/frontend-tools/locale/af-ZA.ini
 share/obs/obs-plugins/frontend-tools/locale/ar-SA.ini
 share/obs/obs-plugins/frontend-tools/locale/bg-BG.ini
 share/obs/obs-plugins/frontend-tools/locale/bn-BD.ini
@@ -156,6 +157,7 @@ share/obs/obs-plugins/frontend-tools/loc
 share/obs/obs-plugins/frontend-tools/locale/fil-PH.ini
 share/obs/obs-plugins/frontend-tools/locale/fr-FR.ini
 share/obs/obs-plugins/frontend-tools/locale/gd-GB.ini
+share/obs/obs-plugins/frontend-tools/locale/gl-ES.ini
 share/obs/obs-plugins/frontend-tools/locale/he-IL.ini
 share/obs/obs-plugins/frontend-tools/locale/hr-HR.ini
 share/obs/obs-plugins/frontend-tools/locale/hu-HU.ini
@@ -174,6 +176,7 @@ share/obs/obs-plugins/frontend-tools/loc
 share/obs/obs-plugins/frontend-tools/locale/ro-RO.ini
 share/obs/obs-plugins/frontend-tools/locale/ru-RU.ini
 share/obs/obs-plugins/frontend-tools/locale/sk-SK.ini
+share/obs/obs-plugins/frontend-tools/locale/sl-SI.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-CS.ini
 share/obs/obs-plugins/frontend-tools/locale/sr-SP.ini
 share/obs/obs-plugins/frontend-tools/locale/sv-SE.ini
@@ -192,6 +195,7 @@ share/obs/obs-plugins/frontend-tools/scr
 share/obs/obs-plugins/frontend-tools/scripts/clock-source/second.png
 share/obs/obs-plugins/frontend-tools/scripts/countdown.lua
 share/obs/obs-plugins/frontend-tools/scripts/instant-replay.lua
+share/obs/obs-plugins/frontend-tools/scripts/pause-scene.lua
 share/obs/obs-plugins/frontend-tools/scripts/url-text.py
 share/obs/obs-plugins/image-source/locale/ar-SA.ini
 share/obs/obs-plugins/image-source/locale/bg-BG.ini
@@ -487,6 +491,7 @@ share/obs/obs-plugins/obs-outputs/locale
 share/obs/obs-plugins/obs-outputs/locale/es-ES.ini
 share/obs/obs-plugins/obs-outputs/locale/et-EE.ini
 share/obs/obs-plugins/obs-outputs/locale/eu-ES.ini
+share/obs/obs-plugins/obs-outputs/locale/fa-IR.ini
 share/obs/obs-plugins/obs-outputs/locale/fi-FI.ini
 share/obs/obs-plugins/obs-outputs/locale/fil-PH.ini
 share/obs/obs-plugins/obs-outputs/locale/fr-FR.ini
@@ -555,6 +560,7 @@ share/obs/obs-plugins/obs-transitions/lo
 share/obs/obs-plugins/obs-transitions/locale/ro-RO.ini
 share/obs/obs-plugins/obs-transitions/locale/ru-RU.ini
 share/obs/obs-plugins/obs-transitions/locale/sk-SK.ini
+share/obs/obs-plugins/obs-transitions/locale/sl-SI.ini
 share/obs/obs-plugins/obs-transitions/locale/sr-CS.ini
 share/obs/obs-plugins/obs-transitions/locale/sr-SP.ini
 share/obs/obs-plugins/obs-transitions/locale/sv-SE.ini
@@ -650,6 +656,7 @@ share/obs/obs-plugins/obs-x264/locale/vi
 share/obs/obs-plugins/obs-x264/locale/zh-CN.ini
 share/obs/obs-plugins/obs-x264/locale/zh-TW.ini
 share/obs/obs-plugins/rtmp-services/locale/ar-SA.ini
+share/obs/obs-plugins/rtmp-services/locale/bg-BG.ini
 share/obs/obs-plugins/rtmp-services/locale/bn-BD.ini
 share/obs/obs-plugins/rtmp-services/locale/ca-ES.ini
 share/obs/obs-plugins/rtmp-services/locale/cs-CZ.ini
@@ -660,6 +667,7 @@ share/obs/obs-plugins/rtmp-services/loca
 share/obs/obs-plugins/rtmp-services/locale/es-ES.ini
 share/obs/obs-plugins/rtmp-services/locale/et-EE.ini
 share/obs/obs-plugins/rtmp-services/locale/eu-ES.ini
+share/obs/obs-plugins/rtmp-services/locale/fa-IR.ini
 share/obs/obs-plugins/rtmp-services/locale/fi-FI.ini
 share/obs/obs-plugins/rtmp-services/locale/fil-PH.ini
 share/obs/obs-plugins/rtmp-services/locale/fr-FR.ini
@@ -749,6 +757,7 @@ share/obs/obs-studio/license/gplv2.txt
 share/obs/obs-studio/locale.ini
 share/obs/obs-studio/locale/af-ZA.ini
 share/obs/obs-studio/locale/ar-SA.ini
+share/obs/obs-studio/locale/az-AZ.ini
 share/obs/obs-studio/locale/bg-BG.ini
 share/obs/obs-studio/locale/bn-BD.ini
 share/obs/obs-studio/locale/ca-ES.ini
@@ -823,6 +832,7 @@ share/obs/obs-studio/themes/Dark.qss
 share/obs/obs-studio/themes/Dark/down.svg
 share/obs/obs-studio/themes/Dark/expand.svg
 share/obs/obs-studio/themes/Dark/locked.svg
+share/obs/obs-studio/themes/Dark/media-pause.svg
 share/obs/obs-studio/themes/Dark/minus.svg
 share/obs/obs-studio/themes/Dark/mute.svg
 share/obs/obs-studio/themes/Dark/no_sources.svg
Index: pkgsrc/multimedia/obs-studio/PLIST.NetBSD
diff -u pkgsrc/multimedia/obs-studio/PLIST.NetBSD:1.1 pkgsrc/multimedia/obs-studio/PLIST.NetBSD:1.2
--- pkgsrc/multimedia/obs-studio/PLIST.NetBSD:1.1       Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/PLIST.NetBSD   Thu Oct  3 20:33:15 2019
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2019/06/30 21:01:24 nia Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2019/10/03 20:33:15 nia Exp $
 lib/obs-plugins/linux-alsa.so
 share/obs/obs-plugins/linux-alsa/locale/ar-SA.ini
+share/obs/obs-plugins/linux-alsa/locale/bg-BG.ini
 share/obs/obs-plugins/linux-alsa/locale/bn-BD.ini
 share/obs/obs-plugins/linux-alsa/locale/ca-ES.ini
 share/obs/obs-plugins/linux-alsa/locale/cs-CZ.ini
@@ -32,6 +33,7 @@ share/obs/obs-plugins/linux-alsa/locale/
 share/obs/obs-plugins/linux-alsa/locale/ro-RO.ini
 share/obs/obs-plugins/linux-alsa/locale/ru-RU.ini
 share/obs/obs-plugins/linux-alsa/locale/sk-SK.ini
+share/obs/obs-plugins/linux-alsa/locale/sl-SI.ini
 share/obs/obs-plugins/linux-alsa/locale/sr-CS.ini
 share/obs/obs-plugins/linux-alsa/locale/sr-SP.ini
 share/obs/obs-plugins/linux-alsa/locale/sv-SE.ini
Index: pkgsrc/multimedia/obs-studio/distinfo
diff -u pkgsrc/multimedia/obs-studio/distinfo:1.1 pkgsrc/multimedia/obs-studio/distinfo:1.2
--- pkgsrc/multimedia/obs-studio/distinfo:1.1   Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/distinfo       Thu Oct  3 20:33:15 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1 2019/06/30 21:01:24 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/10/03 20:33:15 nia Exp $
 
-SHA1 (obs-studio-23.2.1.tar.gz) = e3ecba635f87d4dc4423f5d85a500abe5232acfc
-RMD160 (obs-studio-23.2.1.tar.gz) = c289dda912138274698332235ef53edbccfc3e8e
-SHA512 (obs-studio-23.2.1.tar.gz) = aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169
-Size (obs-studio-23.2.1.tar.gz) = 6204515 bytes
+SHA1 (obs-studio-24.0.1.tar.gz) = efed70ace4dcde2d011b8e1655ba69d02d90f0c9
+RMD160 (obs-studio-24.0.1.tar.gz) = 8620db4865e6e9686d2f3a4a151266803c36d321
+SHA512 (obs-studio-24.0.1.tar.gz) = 53e01ef6bdbb6c226ef0c423562e1584597b1a16c495061b009e6c63cd497ef564a0bae16b83e09a0aa6fb4d632ec8f488b41a660f7c2fe61c356ca36f41368e
+Size (obs-studio-24.0.1.tar.gz) = 6284314 bytes
 SHA1 (patch-UI_obs-app.cpp) = 6f9fc9e1882bbc5fcf263876f7b5624586f636c7
-SHA1 (patch-libobs_graphics_graphics.h) = 8074e4f482ec8d393e58c0bd5b54f285c76ad815
-SHA1 (patch-libobs_obs-nix.c) = 1df73c37851f4870893a4d03e016d58503f359af
+SHA1 (patch-libobs_graphics_graphics.h) = a6e403a03574f7628ac1f8b191b57f9d573c63f0
+SHA1 (patch-libobs_obs-nix.c) = 424721707087e3ddc27cabe6f67832c2bb324814
 SHA1 (patch-plugins_CMakeLists.txt) = 479c6fef54d7dafed70b0f7d369029021b572214
-SHA1 (patch-plugins_obs-outputs_net-if.h) = 246b624586b841f47aa7420c0cb462ff003188bb
+SHA1 (patch-plugins_obs-outputs_net-if.h) = 0f23d809d0616c8a9df77520b9e5ee0a3938778e

Index: pkgsrc/multimedia/obs-studio/PLIST.Linux
diff -u pkgsrc/multimedia/obs-studio/PLIST.Linux:1.3 pkgsrc/multimedia/obs-studio/PLIST.Linux:1.4
--- pkgsrc/multimedia/obs-studio/PLIST.Linux:1.3        Sat Jul  6 14:43:41 2019
+++ pkgsrc/multimedia/obs-studio/PLIST.Linux    Thu Oct  3 20:33:15 2019
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.Linux,v 1.3 2019/07/06 14:43:41 nia Exp $
+@comment $NetBSD: PLIST.Linux,v 1.4 2019/10/03 20:33:15 nia Exp $
 lib/obs-plugins/linux-alsa.so
 lib/obs-plugins/linux-decklink.so
 lib/obs-plugins/linux-v4l2.so
 share/obs/obs-plugins/linux-alsa/locale/ar-SA.ini
+share/obs/obs-plugins/linux-alsa/locale/bg-BG.ini
 share/obs/obs-plugins/linux-alsa/locale/bn-BD.ini
 share/obs/obs-plugins/linux-alsa/locale/ca-ES.ini
 share/obs/obs-plugins/linux-alsa/locale/cs-CZ.ini
@@ -34,6 +35,7 @@ share/obs/obs-plugins/linux-alsa/locale/
 share/obs/obs-plugins/linux-alsa/locale/ro-RO.ini
 share/obs/obs-plugins/linux-alsa/locale/ru-RU.ini
 share/obs/obs-plugins/linux-alsa/locale/sk-SK.ini
+share/obs/obs-plugins/linux-alsa/locale/sl-SI.ini
 share/obs/obs-plugins/linux-alsa/locale/sr-CS.ini
 share/obs/obs-plugins/linux-alsa/locale/sr-SP.ini
 share/obs/obs-plugins/linux-alsa/locale/sv-SE.ini

Index: pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h
diff -u pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h:1.1 pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h:1.2
--- pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h:1.1   Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/patches/patch-libobs_graphics_graphics.h       Thu Oct  3 20:33:15 2019
@@ -1,15 +1,15 @@
-$NetBSD: patch-libobs_graphics_graphics.h,v 1.1 2019/06/30 21:01:24 nia Exp $
+$NetBSD: patch-libobs_graphics_graphics.h,v 1.2 2019/10/03 20:33:15 nia Exp $
 
 Support NetBSD.
 
---- libobs/graphics/graphics.h.orig    2019-06-14 05:28:10.000000000 +0000
+--- libobs/graphics/graphics.h.orig    2019-09-20 15:14:16.000000000 +0000
 +++ libobs/graphics/graphics.h
-@@ -461,7 +461,7 @@ struct gs_window {
-       void                    *hwnd;
+@@ -468,7 +468,7 @@ struct gs_window {
+       void *hwnd;
  #elif defined(__APPLE__)
-       __unsafe_unretained id  view;
+       __unsafe_unretained id view;
 -#elif defined(__linux__) || defined(__FreeBSD__)
 +#else
        /* I'm not sure how portable defining id to uint32_t is. */
        uint32_t id;
-       void* display;
+       void *display;
Index: pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c
diff -u pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c:1.1 pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c:1.2
--- pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c:1.1     Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/patches/patch-libobs_obs-nix.c Thu Oct  3 20:33:15 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-libobs_obs-nix.c,v 1.1 2019/06/30 21:01:24 nia Exp $
+$NetBSD: patch-libobs_obs-nix.c,v 1.2 2019/10/03 20:33:15 nia Exp $
 
 Support NetBSD.
 
---- libobs/obs-nix.c.orig      2019-06-14 05:28:10.000000000 +0000
+--- libobs/obs-nix.c.orig      2019-09-20 15:14:16.000000000 +0000
 +++ libobs/obs-nix.c
 @@ -26,7 +26,9 @@
  #if defined(__FreeBSD__)
@@ -14,7 +14,7 @@ Support NetBSD.
  #include <sys/utsname.h>
  #include <xcb/xcb.h>
  #if USE_XINPUT
-@@ -218,6 +220,7 @@ static void log_processor_info(void)
+@@ -216,6 +218,7 @@ static void log_processor_info(void)
  
  static void log_memory_info(void)
  {
@@ -22,10 +22,10 @@ Support NetBSD.
        struct sysinfo info;
        if (sysinfo(&info) < 0)
                return;
-@@ -226,6 +229,7 @@ static void log_memory_info(void)
-                       (uint64_t)info.totalram * info.mem_unit / 1024 / 1024,
-                       ((uint64_t)info.freeram + (uint64_t)info.bufferram) *
-                       info.mem_unit / 1024 / 1024);
+@@ -225,6 +228,7 @@ static void log_memory_info(void)
+            (uint64_t)info.totalram * info.mem_unit / 1024 / 1024,
+            ((uint64_t)info.freeram + (uint64_t)info.bufferram) *
+                    info.mem_unit / 1024 / 1024);
 +#endif
  }
  
Index: pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h
diff -u pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h:1.1 pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h:1.2
--- pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h:1.1 Sun Jun 30 21:01:24 2019
+++ pkgsrc/multimedia/obs-studio/patches/patch-plugins_obs-outputs_net-if.h     Thu Oct  3 20:33:15 2019
@@ -1,15 +1,22 @@
-$NetBSD: patch-plugins_obs-outputs_net-if.h,v 1.1 2019/06/30 21:01:24 nia Exp $
+$NetBSD: patch-plugins_obs-outputs_net-if.h,v 1.2 2019/10/03 20:33:15 nia Exp $
 
 Support NetBSD.
 
---- plugins/obs-outputs/net-if.h.orig  2019-06-14 05:28:10.000000000 +0000
+--- plugins/obs-outputs/net-if.h.orig  2019-09-20 15:14:16.000000000 +0000
 +++ plugins/obs-outputs/net-if.h
-@@ -28,7 +28,7 @@
+@@ -28,13 +28,13 @@
  
- #  ifdef __linux__
- #    include <linux/if_link.h>
--#  elif __FreeBSD__
-+#  elif defined(__FreeBSD__) || defined(__NetBSD__)
- #    include <netinet/in.h>
- #    ifndef _GNU_SOURCE
- #      define _GNU_SOURCE
+ #ifdef __linux__
+ #include <linux/if_link.h>
+-#elif __FreeBSD__
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <netinet/in.h>
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #define __NET_IF_GNU_SOURCE__
+ #endif //_GNU_SOURCE
+-#endif //__FreeBSD__
++#endif //defined(__FreeBSD__) || defined(__NetBSD__)
+ 
+ #include <ifaddrs.h>
+ #include <netdb.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index