MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[-] Rename source and target names from forked-daapd to owntone

This commit is contained in:
ejurgensen 2021-04-09 19:43:43 +02:00
parent 0871a49f28
commit f61665b81d
10 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -29,9 +29,9 @@ missing
stamp-h1 stamp-h1
autotools-stamp autotools-stamp
build-stamp build-stamp
forked-daapd.spec owntone.spec
forked-daapd.conf owntone.conf
forked-daapd.service owntone.service
# ignore debian packaging for convenience # ignore debian packaging for convenience
debian/ debian/

10
Makefile.am
View File

@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
RPM_SPEC_FILE = forked-daapd.spec RPM_SPEC_FILE = owntone.spec
CONF_FILE = forked-daapd.conf CONF_FILE = owntone.conf
SYSTEMD_SERVICE_FILE = forked-daapd.service SYSTEMD_SERVICE_FILE = owntone.service
sysconf_DATA = $(CONF_FILE) sysconf_DATA = $(CONF_FILE)
@ -10,7 +10,7 @@ BUILT_SOURCES = $(CONF_FILE) $(SYSTEMD_SERVICE_FILE)
SUBDIRS = sqlext src htdocs SUBDIRS = sqlext src htdocs
dist_man_MANS = forked-daapd.8 dist_man_MANS = owntone.8
nobase_dist_doc_DATA = \ nobase_dist_doc_DATA = \
UPGRADING \ UPGRADING \
@ -38,7 +38,7 @@ CLEANFILES = $(BUILT_SOURCES)
do_subst = $(SED) -e 's|@sbindir[@]|$(sbindir)|g' \ do_subst = $(SED) -e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \
-e 's|@PACKAGE[@]|$(PACKAGE)|g' \ -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
-e 's|@DAAPD_USER[@]|$(DAAPD_USER)|g' -e 's|@OWNTONE_USER[@]|$(OWNTONE_USER)|g'
# these files use $prefix, which is determined at build (not configure) time # these files use $prefix, which is determined at build (not configure) time
$(CONF_FILE) $(SYSTEMD_SERVICE_FILE): Makefile $(CONF_FILE) $(SYSTEMD_SERVICE_FILE): Makefile

30
configure.ac
View File

@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([forked-daapd], [27.4]) AC_INIT([owntone], [27.4])
AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -50,12 +50,12 @@ AC_SUBST([AM_CPPFLAGS])
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADERS_ONCE([regex.h pthread_np.h]) AC_CHECK_HEADERS_ONCE([regex.h pthread_np.h])
AC_CHECK_HEADERS([sys/wait.h sys/param.h dirent.h getopt.h stdint.h], [], AC_CHECK_HEADERS([sys/wait.h sys/param.h dirent.h getopt.h stdint.h], [],
[AC_MSG_ERROR([[Missing header required to build forked-daapd]])]) [AC_MSG_ERROR([[Missing header required to build OwnTone]])])
AC_CHECK_HEADERS([time.h], [], AC_CHECK_HEADERS([time.h], [],
[AC_MSG_ERROR([[Missing header required to build forked-daapd]])]) [AC_MSG_ERROR([[Missing header required to build OwnTone]])])
AC_CHECK_FUNCS_ONCE([posix_fadvise pipe2]) AC_CHECK_FUNCS_ONCE([posix_fadvise pipe2])
AC_CHECK_FUNCS([strptime strtok_r], [], AC_CHECK_FUNCS([strptime strtok_r], [],
[AC_MSG_ERROR([[Missing function required to build forked-daapd]])]) [AC_MSG_ERROR([[Missing function required to build OwnTone]])])
dnl check for clock_gettime or replace it dnl check for clock_gettime or replace it
AC_SEARCH_LIBS([clock_gettime], [rt], AC_SEARCH_LIBS([clock_gettime], [rt],
@ -344,19 +344,19 @@ FORK_ARG_DISABLE([Include default web interface], [webinterface], [WEBINTERFACE]
AM_CONDITIONAL([COND_WEBINTERFACE], [[test "x$enable_webinterface" = "xyes"]]) AM_CONDITIONAL([COND_WEBINTERFACE], [[test "x$enable_webinterface" = "xyes"]])
dnl Defining users and groups dnl Defining users and groups
AC_ARG_WITH([daapd_user], AC_ARG_WITH([owntone_user],
[AS_HELP_STRING([--with-daapd-user=USER], [AS_HELP_STRING([--with-user=USER],
[User for running forked-daapd (default=daapd)])], [User for running OwnTone (default=owntone)])],
[[test x"$withval" = xyes && withval=]], [[withval=]]) [[test x"$withval" = xyes && withval=]], [[withval=]])
DAAPD_USER=${withval:-daapd} OWNTONE_USER=${withval:-owntone}
AC_SUBST([DAAPD_USER]) AC_SUBST([OWNTONE_USER])
AC_ARG_WITH([daapd_group], AC_ARG_WITH([owntone_group],
[AS_HELP_STRING([--with-daapd-group=GROUP], [AS_HELP_STRING([--with-group=GROUP],
[Group for daapd user (default=USER)])], [Group for owntone user (default=USER)])],
[[test x"$withval" = xyes && withval=]], [[withval=]]) [[test x"$withval" = xyes && withval=]], [[withval=]])
DAAPD_GROUP=${withval:-$DAAPD_USER} OWNTONE_GROUP=${withval:-$OWNTONE_USER}
AC_SUBST([DAAPD_GROUP]) AC_SUBST([OWNTONE_GROUP])
dnl --- End options --- dnl --- End options ---
AC_CONFIG_FILES([ AC_CONFIG_FILES([
@ -364,6 +364,6 @@ AC_CONFIG_FILES([
sqlext/Makefile sqlext/Makefile
htdocs/Makefile htdocs/Makefile
Makefile Makefile
forked-daapd.spec owntone.spec
]) ])
AC_OUTPUT AC_OUTPUT

0
forked-daapd.8 → owntone.8
View File

33
forked-daapd.conf.in → owntone.conf.in
View File

@ -1,4 +1,4 @@
# A quick guide to configuring forked-daapd: # A quick guide to configuring OwnTone:
# #
# For regular use, the most important setting to configure is "directories", # For regular use, the most important setting to configure is "directories",
# which should be the location of your media. Whatever user you have set as # which should be the location of your media. Whatever user you have set as
@ -11,7 +11,7 @@ general {
# Username # Username
# Make sure the user has read access to the library directories you set # Make sure the user has read access to the library directories you set
# below, and full access to the databases, log and local audio # below, and full access to the databases, log and local audio
uid = "@DAAPD_USER@" uid = "@OWNTONE_USER@"
# Database location # Database location
# db_path = "@localstatedir@/cache/@PACKAGE@/songs3.db" # db_path = "@localstatedir@/cache/@PACKAGE@/songs3.db"
@ -140,7 +140,7 @@ library {
# name_radio = "Radio" # name_radio = "Radio"
# Artwork file names (without file type extension) # Artwork file names (without file type extension)
# forked-daapd will look for jpg and png files with these base names # OwnTone will look for jpg and png files with these base names
# artwork_basenames = { "artwork", "cover", "Folder" } # artwork_basenames = { "artwork", "cover", "Folder" }
# Enable searching for artwork corresponding to each individual media # Enable searching for artwork corresponding to each individual media
@ -162,11 +162,11 @@ library {
# filepath_ignore = { "myregex" } # filepath_ignore = { "myregex" }
# Disable startup file scanning # Disable startup file scanning
# When forked-daapd starts it will do an initial file scan of your # When OwnTone starts it will do an initial file scan of your
# library (and then watch it for changes). If you are sure your library # library (and then watch it for changes). If you are sure your library
# never changes while forked-daapd is not running, you can disable the # never changes while OwnTone is not running, you can disable the
# initial file scan and save some system ressources. Disabling this scan # initial file scan and save some system ressources. Disabling this scan
# may lead to forked-daapd's database coming out of sync with the # may lead to OwnTone's database coming out of sync with the
# library. If that happens read the instructions in the README on how # library. If that happens read the instructions in the README on how
# to trigger a rescan. # to trigger a rescan.
# filescan_disable = false # filescan_disable = false
@ -184,7 +184,7 @@ library {
# Decoding options for DAAP clients # Decoding options for DAAP clients
# Since iTunes has native support for mpeg, mp4a, mp4v, alac and wav, # Since iTunes has native support for mpeg, mp4a, mp4v, alac and wav,
# such files will be sent as they are. Any other formats will be decoded # such files will be sent as they are. Any other formats will be decoded
# to raw wav. If forked-daapd detects a non-iTunes DAAP client, it is # to raw wav. If OwnTone detects a non-iTunes DAAP client, it is
# assumed to only support mpeg and wav, other formats will be decoded. # assumed to only support mpeg and wav, other formats will be decoded.
# Here you can change when to decode. Note that these settings have no # Here you can change when to decode. Note that these settings have no
# effect on AirPlay. # effect on AirPlay.
@ -216,7 +216,7 @@ library {
# allow_modifying_stored_playlists = false # allow_modifying_stored_playlists = false
# A directory in one of the library directories that will be used as the default # A directory in one of the library directories that will be used as the default
# playlist directory. forked-dapd creates new playlists in this directory if only # playlist directory. OwnTone creates new playlists in this directory if only
# a playlist name is provided (requires "allow_modify_stored_playlists" set to true). # a playlist name is provided (requires "allow_modify_stored_playlists" set to true).
# default_playlist_directory = "" # default_playlist_directory = ""
} }
@ -283,7 +283,7 @@ audio {
#} #}
# Pipe output # Pipe output
# Allows forked-daapd to output audio data to a named pipe # Allows OwnTone to output audio data to a named pipe
#fifo { #fifo {
# nickname = "fifo" # nickname = "fifo"
# path = "/path/to/fifo" # path = "/path/to/fifo"
@ -291,8 +291,9 @@ audio {
# AirPlay settings common to all devices # AirPlay settings common to all devices
#airplay_shared { #airplay_shared {
# UDP ports used when airplay devices make connections back to forked-daapd # UDP ports used when airplay devices make connections back to
# (choosing specific ports may be helpful when running forked-daapd behind a firewall) # OwnTone (choosing specific ports may be helpful when running
# OwnTone behind a firewall)
# control_port = 0 # control_port = 0
# timing_port = 0 # timing_port = 0
#} #}
@ -300,7 +301,7 @@ audio {
# AirPlay per device settings # AirPlay per device settings
# (make sure you get the capitalization of the device name right) # (make sure you get the capitalization of the device name right)
#airplay "My AirPlay device" { #airplay "My AirPlay device" {
# forked-daapd's volume goes to 11! If that's more than you can handle # OwnTone's volume goes to 11! If that's more than you can handle
# you can set a lower value here # you can set a lower value here
# max_volume = 11 # max_volume = 11
@ -310,11 +311,11 @@ audio {
# Enable this option to keep a particular AirPlay device in the speaker # Enable this option to keep a particular AirPlay device in the speaker
# list and thus ignore mdns notifications about it no longer being # list and thus ignore mdns notifications about it no longer being
# present. The speaker will remain until restart of forked-daapd. # present. The speaker will remain until restart of OwnTone.
# permanent = false # permanent = false
# Some devices spuriously disconnect during playback, and based on the # Some devices spuriously disconnect during playback, and based on the
# device type forked-daapd may attempt to reconnect. Setting this option # device type OwnTone may attempt to reconnect. Setting this option
# overrides this so reconnecting is either always enabled or disabled. # overrides this so reconnecting is either always enabled or disabled.
# reconnect = false # reconnect = false
@ -331,7 +332,7 @@ audio {
# Chromecast settings # Chromecast settings
# (make sure you get the capitalization of the device name right) # (make sure you get the capitalization of the device name right)
#chromecast "My Chromecast device" { #chromecast "My Chromecast device" {
# forked-daapd's volume goes to 11! If that's more than you can handle # OwnTone's volume goes to 11! If that's more than you can handle
# you can set a lower value here # you can set a lower value here
# max_volume = 11 # max_volume = 11
@ -387,7 +388,7 @@ mpd {
# work). Set to 0 to disable serving artwork over http. # work). Set to 0 to disable serving artwork over http.
# http_port = 0 # http_port = 0
# By default forked-daapd will - like iTunes - clear the playqueue if # By default OwnTone will - like iTunes - clear the playqueue if
# playback stops. Setting clear_queue_on_stop_disable to true will keep # playback stops. Setting clear_queue_on_stop_disable to true will keep
# the playlist like MPD does. Note that some dacp clients do not show # the playlist like MPD does. Note that some dacp clients do not show
# the playqueue if playback is stopped. # the playqueue if playback is stopped.

6
forked-daapd.service.in → owntone.service.in
View File

@ -1,13 +1,13 @@
[Unit] [Unit]
Description=DAAP/DACP (iTunes), RSP and MPD server, supports AirPlay and Remote Description=DAAP/DACP (iTunes), RSP and MPD server, supports AirPlay and Remote
Documentation=man:forked-daapd(8) Documentation=man:owntone(8)
After=network.target sound.target remote-fs.target pulseaudio.service avahi-daemon.service After=network.target sound.target remote-fs.target pulseaudio.service avahi-daemon.service
[Service] [Service]
ExecStart=@sbindir@/forked-daapd -f ExecStart=@sbindir@/owntone -f
# Constrain the upper limit of memory/swap that can be used; this prevents # Constrain the upper limit of memory/swap that can be used; this prevents
# forked-daapd from consuming all system memory (in event of bug/malformed user # the server from consuming all system memory (in event of bug/malformed user
# curl/SMARTPL query etc) that would hang/freeze low resource and headless (ie # curl/SMARTPL query etc) that would hang/freeze low resource and headless (ie
# RPi) machines # RPi) machines
# #

18
forked-daapd.spec.in → owntone.spec.in
View File

@ -1,7 +1,7 @@
# @configure_input@ # @configure_input@
# -*- Mode:rpm-spec -*- # -*- Mode:rpm-spec -*-
%global username @DAAPD_USER@ %global username @OWNTONE_USER@
%global groupname @DAAPD_GROUP@ %global groupname @OWNTONE_GROUP@
%bcond_without alsa %bcond_without alsa
%bcond_without pulseaudio %bcond_without pulseaudio
@ -12,7 +12,7 @@
%global _hardened_build 1 %global _hardened_build 1
Summary: iTunes-compatible DAAP server with MPD and RSP support Summary: iTunes-compatible DAAP server with MPD and RSP support
Name: forked-daapd Name: owntone
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
@ -51,8 +51,8 @@ BuildRequires: pkgconfig(gnutls)
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%description %description
forked-daapd is a DAAP/DACP (iTunes), MPD (Music Player Daemon) OwnTone is a DAAP/DACP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media
and RSP (Roku) media server. server.
It has support for AirPlay devices/speakers, Apple Remote (and compatibles), It has support for AirPlay devices/speakers, Apple Remote (and compatibles),
MPD clients, Chromecast, network streaming, internet radio, Spotify and LastFM. MPD clients, Chromecast, network streaming, internet radio, Spotify and LastFM.
@ -62,8 +62,6 @@ It does not support streaming video by AirPlay nor Chromecast.
DAAP stands for Digital Audio Access Protocol, and is the protocol used DAAP stands for Digital Audio Access Protocol, and is the protocol used
by iTunes and friends to share/stream media libraries over the network. by iTunes and friends to share/stream media libraries over the network.
forked-daapd is a complete rewrite of mt-daapd (Firefly Media Server).
%prep %prep
%setup -q %setup -q
@ -83,7 +81,7 @@ mkdir -p %{buildroot}%{homedir}
mkdir -p %{buildroot}%{_localstatedir}/log mkdir -p %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/%{name}.log touch %{buildroot}%{_localstatedir}/log/%{name}.log
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -m 0644 forked-daapd.service %{buildroot}%{_unitdir}/%{name}.service install -m 0644 owntone.service %{buildroot}%{_unitdir}/%{name}.service
rm -f %{buildroot}%{_libdir}/%{name}/*.la rm -f %{buildroot}%{_libdir}/%{name}/*.la
%pre %pre
@ -106,8 +104,8 @@ exit 0
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%{_pkgdocdir} %{_pkgdocdir}
%config(noreplace) %{_sysconfdir}/forked-daapd.conf %config(noreplace) %{_sysconfdir}/owntone.conf
%{_sbindir}/forked-daapd %{_sbindir}/owntone
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%{_datarootdir}/%{name}/ %{_datarootdir}/%{name}/
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service

8
sqlext/Makefile.am
View File

@ -1,9 +1,9 @@
pkglib_LTLIBRARIES = forked-daapd-sqlext.la pkglib_LTLIBRARIES = owntone-sqlext.la
forked_daapd_sqlext_la_SOURCES = sqlext.c owntone_sqlext_la_SOURCES = sqlext.c
forked_daapd_sqlext_la_LDFLAGS = -avoid-version -module -shared owntone_sqlext_la_LDFLAGS = -avoid-version -module -shared
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(COMMON_CPPFLAGS) $(COMMON_CPPFLAGS)
forked_daapd_sqlext_la_LIBADD = \ owntone_sqlext_la_LIBADD = \
$(COMMON_LIBS) $(COMMON_LIBS)

6
src/Makefile.am
View File

@ -1,5 +1,5 @@
sbin_PROGRAMS = forked-daapd sbin_PROGRAMS = owntone
if COND_SPOTIFY if COND_SPOTIFY
SPOTIFY_SRC=spotify.c spotify.h spotify_webapi.c spotify_webapi.h inputs/spotify.c SPOTIFY_SRC=spotify.c spotify.h spotify_webapi.c spotify_webapi.h inputs/spotify.c
@ -85,12 +85,12 @@ AM_CPPFLAGS += \
-DSTATEDIR=\"$(localstatedir)\" \ -DSTATEDIR=\"$(localstatedir)\" \
-DPKGLIBDIR=\"$(pkglibdir)\" -DPKGLIBDIR=\"$(pkglibdir)\"
forked_daapd_LDADD = \ owntone_LDADD = \
$(FORKED_LIBS) \ $(FORKED_LIBS) \
$(FORKED_OPTS_LIBS) \ $(FORKED_OPTS_LIBS) \
$(COMMON_LIBS) $(COMMON_LIBS)
forked_daapd_SOURCES = main.c \ owntone_SOURCES = main.c \
db.c db.h \ db.c db.h \
db_init.c db_init.h \ db_init.c db_init.h \
db_upgrade.c db_upgrade.h \ db_upgrade.c db_upgrade.h \

6
src/main.c
View File

@ -637,7 +637,7 @@ main(int argc, char **argv)
/* Set up libevent logging callback */ /* Set up libevent logging callback */
event_set_log_callback(logger_libevent); event_set_log_callback(logger_libevent);
DPRINTF(E_LOG, L_MAIN, "Forked Media Server Version %s taking off\n", VERSION); DPRINTF(E_LOG, L_MAIN, "OwnTone version %s taking off\n", VERSION);
DPRINTF(E_LOG, L_MAIN, "Built with:\n"); DPRINTF(E_LOG, L_MAIN, "Built with:\n");
buildopts = buildopts_get(); buildopts = buildopts_get();
@ -858,7 +858,9 @@ main(int argc, char **argv)
/* Register this CNAME with mDNS for OAuth */ /* Register this CNAME with mDNS for OAuth */
if (!mdns_no_cname) if (!mdns_no_cname)
mdns_cname("forked-daapd.local"); {
mdns_cname("owntone.local");
}
#ifdef HAVE_SIGNALFD #ifdef HAVE_SIGNALFD
/* Set up signal fd */ /* Set up signal fd */