Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2022-11-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified build system to use pkg-config(1) to detect ALSA and
	JACK support elements in 'configure'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-11-21 15:10:07 -05:00
parent bef88a1336
commit 9dfa9c84eb
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23709,3 +23709,6 @@
2022-11-18 Fred Gleason <fredg@paravelsystems.com>
* Added the 'fop-static' package to the list of required
build packages for RHEL-8 and RHEL-9.
2022-11-21 Fred Gleason <fredg@paravelsystems.com>
* Modified build system to use pkg-config(1) to detect ALSA and
JACK support elements in 'configure'.

4
cae/Makefile.am
View File

@@ -19,7 +19,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ @LIBJACK_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
@@ -46,7 +46,7 @@ nodist_caed_SOURCES = moc_cae.cpp\
caed_LDADD = @LIB_RDLIBS@\
@LIBALSA@\
@LIBHPI@\
@LIBJACK@\
@LIBJACK_LIBS@\
@LIBSRC@\
@LIBVORBIS@\
@QT5_LIBS@\

15
configure.ac
View File

@@ -386,8 +386,6 @@ if test $DOCBOOK_STYLESHEETS ; then
ln -s $DOCBOOK_STYLESHEETS helpers/docbook
fi
#AC_SUBST(DOCBOOK_STYLESHEETS,$DOCBOOK_STYLESHEETS)
#
# RDXport Debug
#
@@ -432,8 +430,8 @@ fi
# Setup Sound API Dependencies
#
AC_CHECK_HEADER(asihpi/hpi.h,[HPI_FOUND=yes],[])
AC_CHECK_HEADER(jack/jack.h,[JACK_FOUND=yes],[])
AC_CHECK_HEADER(alsa/asoundlib.h,[ALSA_FOUND=yes],[])
PKG_CHECK_MODULES(LIBJACK,jack,[JACK_FOUND=yes],[])
PKG_CHECK_MODULES(ASOUNDLIB,alsa,[ALSA_FOUND=yes],[])
if test $HPI_FOUND ; then
if test -z $HPI_DISABLED ; then
USING_HPI=yes
@@ -465,14 +463,15 @@ if test $JACK_FOUND ; then
AC_MSG_ERROR([*** libsamplerate not found, but is needed for JACK support ***])
fi
AC_DEFINE(JACK,yes)
AC_SUBST(LIBJACK,-ljack)
SRC_NEEDED=yes
USING_JACK=yes
else
AC_SUBST(LIBJACK,"")
fi
AC_SUBST(JACK_CFLAGS,"")
AC_SUBST(JACK_LIBS,"")
fi
else
AC_SUBST(LIBJACK,"")
AC_SUBST(JACK_CFLAGS,"")
AC_SUBST(JACK_LIBS,"")
fi
if test $ALSA_FOUND ; then

4
ripcd/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ @LIBJACK_CFLAGS@
LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi
MOC = @QT_MOC@
@@ -133,7 +133,7 @@ ripcd_LDADD = @LIB_RDLIBS@\
@LIBVORBIS@\
@QT5_LIBS@\
@LIBHPI@\
@LIBJACK@\
@LIBJACK_LIBS@\
@MUSICBRAINZ_LIBS@\
@IMAGEMAGICK_LIBS@

10
rivendell.spec.in
View File

@@ -21,7 +21,7 @@
##
# So python bytecompilation works correctly
%define __python /usr/bin/python3.6
%define __python /usr/bin/python3
Summary: Radio Broadcast Automation System
Name: rivendell
@@ -33,7 +33,7 @@ Source: rivendell-@VERSION@.tar.gz
Requires: @MYSQL_PKG@ @QT_MYSQL_PKG@ @APACHE_PKG@ curl @USERMODE_PKG@ rsyslog qt5-qtstyleplugins qt5-qttranslations @PYPAD_DEPS@ libxslt icedax
BuildRequires: qt5-qtbase-devel qt5-linguist
BuildRoot: /var/tmp/rivendell-@VERSION@
Obsoletes: rivendell-base rivendell-opsguide rivendell-pypad
Obsoletes: rivendell-base < 4.0.0 rivendell-opsguide < 4.0.0 rivendell-pypad < 4.0.0
Conflicts: rivendell-opsguide
%package importers
@@ -112,7 +112,7 @@ This package contains the WebGet audio fetching tool for Rivendell.
%build
export PYTHON=/usr/bin/python3.6
export PYTHON=/usr/bin/python3
%configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@
make -j @CPUS_AVAIL@
@@ -218,7 +218,7 @@ cp scripts/engine_conv.py $RPM_BUILD_ROOT/@DOC_PATH@
cp scripts/init_template_host.py $RPM_BUILD_ROOT/@DOC_PATH@
rm -f $RPM_BUILD_ROOT/etc/auto.rd.audiostore
rm -rf $RPM_BUILD_ROOT%{_libdir}/rivendell/pypad/__pycache__
rm -rf $RPM_BUILD_ROOT%{_libdir}/python3.6/site-packages/__pycache__
rm -rf $RPM_BUILD_ROOT%{_libdir}/python@PYTHON_VERSION@/site-packages/__pycache__
%post
@@ -476,7 +476,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/librd.la
%{_libdir}/librd.so
%{_libdir}/rivendell/pypad/*
%{_libdir}/python3.6/site-packages/rivendellaudio/*
%{_libdir}/python@PYTHON_VERSION@/site-packages/rivendellaudio/*
%{_sbindir}/rdservice
%{_sbindir}/caed
%{_sbindir}/ripcd