Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Add FreeBSD support #264

Merged
merged 4 commits into from Jan 26, 2014
Merged

Add FreeBSD support #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31ee8c0
freebsd: Add FreeBSD platform to the addon.xml files
decke Jan 13, 2014
3af05a6
Teach configure how to distinguish between FreeBSD amd64 and i386
decke Jan 15, 2014
7a6f136
Add ADDON_HELPER_ARCH for FreeBSD
decke Jan 15, 2014
72fe3d7
Add FreeBSD defines to the Socket code
decke Jan 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/pvr.argustv/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_ArgusTV.pvr"
library_osx="XBMC_ArgusTV.pvr"
library_freebsd="XBMC_ArgusTV.pvr"
library_wingl="XBMC_ArgusTV_win32.dll"
library_windx="XBMC_ArgusTV_win32.dll"
library_android="libXBMC_ArgusTV.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.demo/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_Demo.pvr"
library_osx="XBMC_Demo.pvr"
library_freebsd="XBMC_Demo.pvr"
library_wingl="XBMC_Demo_win32.dll"
library_windx="XBMC_Demo_win32.dll"
library_android="libXBMC_Demo.so" />
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.dvblink/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_DVBLink.pvr"
library_osx="XBMC_DVBLink.pvr"
library_freebsd="XBMC_DVBLink.pvr"
library_wingl="XBMC_DVBLink_win32.dll"
library_windx="XBMC_DVBLink_win32.dll"
library_android="libXBMC_DVBLink.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.dvbviewer/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_dvbviewer.pvr"
library_osx="XBMC_dvbviewer.pvr"
library_freebsd="XBMC_dvbviewer.pvr"
library_wingl="XBMC_dvbviewer_win32.dll"
library_windx="XBMC_dvbviewer_win32.dll"
library_android="libXBMC_dvbviewer.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.hts/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_Tvheadend.pvr"
library_osx="XBMC_Tvheadend.pvr"
library_freebsd="XBMC_Tvheadend.pvr"
library_wingl="XBMC_Tvheadend_win32.dll"
library_windx="XBMC_Tvheadend_win32.dll"
library_android="libXBMC_Tvheadend.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.iptvsimple/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_IPTV_Simple.pvr"
library_osx="XBMC_IPTV_Simple.pvr"
library_freebsd="XBMC_IPTV_Simple.pvr"
library_wingl="XBMC_IPTV_Simple_win32.dll"
library_windx="XBMC_IPTV_Simple_win32.dll"
library_android="libXBMC_IPTV_Simple.so" />
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.mediaportal.tvserver/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_Mediaportal.pvr"
library_osx="XBMC_Mediaportal.pvr"
library_freebsd="XBMC_Mediaportal.pvr"
library_wingl="XBMC_Mediaportal_win32.dll"
library_windx="XBMC_Mediaportal_win32.dll"
library_android="libXBMC_Mediaportal.so"/>
Expand Down
4 changes: 2 additions & 2 deletions addons/pvr.mediaportal.tvserver/src/Socket.cpp
View file
Open in desktop
Expand Up @@ -608,7 +608,7 @@ void Socket::osCleanup()
}
}

#elif defined TARGET_LINUX || defined TARGET_DARWIN
#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
bool Socket::set_non_blocking ( const bool b )
{
int opts;
Expand Down Expand Up @@ -720,6 +720,6 @@ void Socket::osCleanup()
{
// Not needed for Linux
}
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD

} //namespace MPTV
2 changes: 1 addition & 1 deletion addons/pvr.mediaportal.tvserver/src/Socket.h
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ enum SocketFamily

enum SocketDomain
{
#if defined TARGET_LINUX || defined TARGET_DARWIN
#if defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
pf_unix = PF_UNIX,
pf_local = PF_LOCAL,
#endif
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.mythtv.cmyth/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_MythTV_cmyth.pvr"
library_osx="XBMC_MythTV_cmyth.pvr"
library_freebsd="XBMC_MythTV_cmyth.pvr"
library_wingl="XBMC_MythTV_cmyth_win32.dll"
library_windx="XBMC_MythTV_cmyth_win32.dll"
library_android="libXBMC_MythTV_cmyth.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.nextpvr/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_NextPVR.pvr"
library_osx="XBMC_NextPVR.pvr"
library_freebsd="XBMC_NextPVR.pvr"
library_wingl="XBMC_NextPVR_win32.dll"
library_windx="XBMC_NextPVR_win32.dll"
library_android="libXBMC_NextPVR.so"/>
Expand Down
4 changes: 2 additions & 2 deletions addons/pvr.nextpvr/src/Socket.cpp
View file
Open in desktop
Expand Up @@ -658,7 +658,7 @@ void Socket::osCleanup()
}
}

#elif defined TARGET_LINUX || defined TARGET_DARWIN
#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
bool Socket::set_non_blocking ( const bool b )
{
int opts;
Expand Down Expand Up @@ -767,6 +767,6 @@ void Socket::osCleanup()
{
// Not needed for Linux
}
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD

} //namespace NextPVR
2 changes: 1 addition & 1 deletion addons/pvr.nextpvr/src/Socket.h
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ enum SocketFamily

enum SocketDomain
{
#if defined TARGET_LINUX || defined TARGET_DARWIN
#if defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
pf_unix = PF_UNIX,
pf_local = PF_LOCAL,
#endif
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.njoy/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_osx="XBMC_Njoy.pvr"
library_linux="XBMC_Njoy.pvr"
library_freebsd="XBMC_Njoy.pvr"
library_wingl="XBMC_njoy_win32.dll"
library_windx="XBMC_njoy_win32.dll"
library_android="libXBMC_Njoy.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.vdr.vnsi/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_VDR_vnsi.pvr"
library_osx="XBMC_VDR_vnsi.pvr"
library_freebsd="XBMC_VDR_vnsi.pvr"
library_wingl="XBMC_VDR_vnsi_WIN32.dll"
library_windx="XBMC_VDR_vnsi_WIN32.dll"
library_android="libXBMC_VDR_vnsi.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.vuplus/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
point="xbmc.pvrclient"
library_linux="XBMC_vuplus.pvr"
library_osx="XBMC_vuplus.pvr"
library_freebsd="XBMC_vuplus.pvr"
library_wingl="XBMC_vuplus_win32.dll"
library_windx="XBMC_vuplus_win32.dll"
library_android="libXBMC_vuplus.so"/>
Expand Down
1 change: 1 addition & 0 deletions addons/pvr.wmc/addon/addon.xml.in
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
library_linux="XBMC_WMC.pvr"
library_wingl="XBMC_WMC_win32.dll"
library_osx="XBMC_WMC.pvr"
library_freebsd="XBMC_WMC.pvr"
library_windx="XBMC_WMC_win32.dll"
library_android="libXBMC_WMC.so" />
<extension point="xbmc.addon.metadata">
Expand Down
4 changes: 2 additions & 2 deletions addons/pvr.wmc/src/Socket.cpp
View file
Open in desktop
Expand Up @@ -442,7 +442,7 @@ void Socket::osCleanup()
}
}

#elif defined TARGET_LINUX || defined TARGET_DARWIN
#elif defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
bool Socket::set_non_blocking ( const bool b )
{
int opts;
Expand Down Expand Up @@ -554,7 +554,7 @@ void Socket::osCleanup()
{
// Not needed for Linux
}
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN
#endif //TARGET_WINDOWS || TARGET_LINUX || TARGET_DARWIN || TARGET_FREEBSD


void Socket::SetServerName(CStdString strServerName)
Expand Down
2 changes: 1 addition & 1 deletion addons/pvr.wmc/src/Socket.h
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ enum SocketFamily

enum SocketDomain
{
#if defined TARGET_LINUX || defined TARGET_DARWIN
#if defined TARGET_LINUX || defined TARGET_DARWIN || defined TARGET_FREEBSD
pf_unix = PF_UNIX,
pf_local = PF_LOCAL,
#endif
Expand Down
8 changes: 7 additions & 1 deletion configure.ac
View file
Open in desktop
Expand Up @@ -104,8 +104,14 @@ case "${host}" in
ARCH_DEFINES="-DTARGET_POSIX -DTARGET_DARWIN -D_LINUX"
DYN_LIB_EXT="dylib"
;;
*-freebsd*)
amd64-*-freebsd*)
OS="freebsd"
ARCHITECTURE="x86_64"
ARCH_DEFINES="-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX"
;;
i386-*-freebsd*)
OS="freebsd"
ARCHITECTURE="i486"
ARCH_DEFINES="-DTARGET_POSIX -DTARGET_FREEBSD -D_LINUX"
;;
esac
Expand Down
10 changes: 10 additions & 0 deletions xbmc/libXBMC_addon.h
View file
Open in desktop
Expand Up @@ -42,6 +42,16 @@
#else
#define ADDON_HELPER_ARCH "x86-osx"
#endif
#elif defined(__FreeBSD__) // freebsd
#if defined(__x86_64__)
#define ADDON_HELPER_ARCH "x86_64-freebsd"
#elif defined(_POWERPC)
#define ADDON_HELPER_ARCH "powerpc-freebsd"
#elif defined(_POWERPC64)
#define ADDON_HELPER_ARCH "powerpc64-freebsd"
#else
#define ADDON_HELPER_ARCH "i386-freebsd"
#endif
#else // linux
#if defined(__x86_64__)
#define ADDON_HELPER_ARCH "x86_64-linux"
Expand Down