cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import upstream patch to fix OSS (sound mixer) support.

Browse Source 
While here, fix malformed line in patch causing build time warning.

Reported by:	pong (via IRC)
Obtained from:	6b386589c0
This commit is contained in:
Guido Falsi 2018-03-24 09:15:14 +00:00
parent 3fe7173bf0
commit 803c148097
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=465440
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysutils/conky/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= conky
PORTVERSION= 1.10.8
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= madpilot@FreeBSD.org

30
sysutils/conky/files/patch-cmake_ConkyPlatformChecks.cmake Normal file
View File

@ -0,0 +1,30 @@
diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
index 334b4690..ce5c109b 100644
--- cmake/ConkyPlatformChecks.cmake
+++ cmake/ConkyPlatformChecks.cmake
@@ -30,8 +30,6 @@ check_include_files(sys/statfs.h HAVE_SYS_STATFS_H)
check_include_files(sys/param.h HAVE_SYS_PARAM_H)
check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
check_include_files(dirent.h HAVE_DIRENT_H)
-check_include_files("soundcard.h;sys/soundcard.h;linux/soundcard.h" HAVE_SOME_SOUNDCARD_H)
-check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H)
# Check for some functions
check_function_exists(strndup HAVE_STRNDUP)
@@ -88,6 +86,16 @@ if(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY
endif(NOT OS_LINUX AND NOT OS_FREEBSD AND NOT OS_OPENBSD AND NOT OS_DRAGONFLY
AND NOT OS_SOLARIS AND NOT OS_HAIKU)
+# Check for soundcard header
+if(OS_LINUX)
+ check_include_files("linux/soundcard.h" HAVE_SOME_SOUNDCARD_H)
+ check_include_files("linux/soundcard.h" HAVE_LINUX_SOUNDCARD_H)
+elseif(OS_OPENBSD)
+ check_include_files("soundcard.h" HAVE_SOME_SOUNDCARD_H)
+else(OS_LINUX)
+ check_include_files("sys/soundcard.h" HAVE_SOME_SOUNDCARD_H)
+endif(OS_LINUX)
+
if(BUILD_I18N AND OS_DRAGONFLY)
set(conky_libs ${conky_libs} -lintl)
endif(BUILD_I18N AND OS_DRAGONFLY)

2
sysutils/conky/files/patch-src_bsdapm.cc
View File

@ -5,7 +5,7 @@
*
*/
+
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
+ || defined(__DragonFly__) \
+ || defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
#include "config.h"