From 4a3454cb8df07ab255cd762a518c7ee559d6eec0 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 7 Nov 2022 16:52:13 -0500 Subject: [PATCH] 2022-11-07 Fred Gleason * Added a dependency for ImageMagick's 'Magick++' library interface. * Added a 'FEED_IMAGES.DATA_MID_THUMB' field to the database. * Added a 'FEED_IMAGES.DATA_SMALL_THUMB' field to the database. * Incremented the database version to 365. * Optimized loading of thumbnail image data in rdadmin(1), rdcastmanager(1) and rdcatch(1). * Re-enabled uploads to RSS feeds in rdcatch(1). Signed-off-by: Fred Gleason --- ChangeLog | 8 ++++ INSTALL | 6 ++- cae/Makefile.am | 5 ++- configure.ac | 5 +++ docs/tables/feed_images.txt | 5 ++- importers/Makefile.am | 14 +++---- lib/Makefile.am | 3 +- lib/dbversion.h | 2 +- lib/librd.pro | 2 + lib/rd.h | 6 +++ lib/rdfeed.cpp | 13 +++--- lib/rdfeedlistmodel.cpp | 5 ++- lib/rdimagemagick.cpp | 35 ++++++++++++++++ lib/rdimagemagick.h | 30 +++++++++++++ rdadmin/Makefile.am | 4 +- rdairplay/Makefile.am | 4 +- rdcartslots/Makefile.am | 4 +- rdcastmanager/Makefile.am | 4 +- rdcatch/Makefile.am | 4 +- rdcatch/edit_upload.cpp | 11 ----- rdcatch/edit_upload.h | 2 +- rdcatch/rdcatch.cpp | 2 + rdcatch/recordlistmodel.cpp | 6 ++- rdcatchd/Makefile.am | 4 +- rdhpi/Makefile.am | 2 +- rdlibrary/Makefile.am | 4 +- rdlogedit/Makefile.am | 4 +- rdlogin/Makefile.am | 6 +-- rdlogmanager/Makefile.am | 4 +- rdmonitor/Makefile.am | 4 +- rdpadd/Makefile.am | 6 +-- rdpadengined/Makefile.am | 6 +-- rdpanel/Makefile.am | 6 +-- rdrepld/Makefile.am | 6 +-- rdrssd/Makefile.am | 6 +-- rdselect/Makefile.am | 4 +- rdservice/Makefile.am | 6 +-- rdvairplayd/Makefile.am | 6 +-- ripcd/Makefile.am | 5 ++- rivendell.spec.in | 1 - tests/Makefile.am | 70 +++++++++++++++---------------- utils/rdalsaconfig/Makefile.am | 6 +-- utils/rdcheckcuts/Makefile.am | 6 +-- utils/rdcleandirs/Makefile.am | 6 +-- utils/rdclilogedit/Makefile.am | 6 +-- utils/rdcollect/Makefile.am | 6 +-- utils/rdconvert/Makefile.am | 6 +-- utils/rddbconfig/Makefile.am | 6 +-- utils/rddbmgr/Makefile.am | 6 +-- utils/rddbmgr/revertschema.cpp | 10 +++++ utils/rddbmgr/schemamap.cpp | 2 +- utils/rddbmgr/updateschema.cpp | 35 ++++++++++++++++ utils/rddelete/Makefile.am | 6 +-- utils/rdexport/Makefile.am | 6 +-- utils/rdgpimon/Makefile.am | 6 +-- utils/rdimport/Makefile.am | 6 +-- utils/rdmaint/Makefile.am | 6 +-- utils/rdmarkerset/Makefile.am | 6 +-- utils/rdmetadata/Makefile.am | 6 +-- utils/rdpopup/Makefile.am | 6 +-- utils/rdrender/Makefile.am | 6 +-- utils/rdselect_helper/Makefile.am | 6 +-- utils/rdsoftkeys/Makefile.am | 6 +-- utils/rmlsend/Makefile.am | 6 +-- web/rdxport/Makefile.am | 4 +- web/webget/Makefile.am | 6 +-- 66 files changed, 323 insertions(+), 184 deletions(-) create mode 100644 lib/rdimagemagick.cpp create mode 100644 lib/rdimagemagick.h diff --git a/ChangeLog b/ChangeLog index 718e9dae..e6ea23d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23616,3 +23616,11 @@ 2022-11-05 Fred Gleason * Fixed a regression in rdadmin(1) that incorrectly handled changing a password to an empty value. +2022-11-07 Fred Gleason + * Added a dependency for ImageMagick's 'Magick++' library interface. + * Added a 'FEED_IMAGES.DATA_MID_THUMB' field to the database. + * Added a 'FEED_IMAGES.DATA_SMALL_THUMB' field to the database. + * Incremented the database version to 365. + * Optimized loading of thumbnail image data in rdadmin(1), + rdcastmanager(1) and rdcatch(1). + * Re-enabled uploads to RSS feeds in rdcatch(1). diff --git a/INSTALL b/INSTALL index 720b7db4..52cc78db 100644 --- a/INSTALL +++ b/INSTALL @@ -18,6 +18,10 @@ ID3Lib An audio metadata tag library. Included in most distros, or available at http://id3lib.sourceforge.net/. +ImageMagick v6 (Magick++ C++ Language Interface) +A incredibly versatile library/utility for manipulating all sorts of graphical +and visual data. Available at https://imagemagick.org/script/index.php. + LibCurl, v7.19.0 or later A client-side URL transfer library. Included with most distros, or available at: http://curl.haxx.se/libcurl/. @@ -271,7 +275,7 @@ DISTRO-SPECIFIC NOTES --------------------- 1) RedHat Enterprise Linux 7 -Required build packages: git gcc-c++ automake autoconf libtool qt5-qtbase-devel qt5-qtbase-mysql libcurl-devel cdparanoia-devel hpklinux-devel alsa-lib-devel jack-audio-connection-kit-devel libsamplerate-devel libsndfile-devel id3lib-devel libvorbis-devel flac-devel pam-devel soundtouch-devel twolame-devel libmad-devel lame-devel rpm-build createrepo fop docbook5-style-xsl libxslt kernel-devel rpm-sign man-pages openssl-devel taglib-devel libmusicbrainz5-devel libdiscid-devel libcoverart libcoverart-devel +Required build packages: git gcc-c++ automake autoconf libtool qt5-qtbase-devel qt5-qtbase-mysql libcurl-devel cdparanoia-devel hpklinux-devel alsa-lib-devel jack-audio-connection-kit-devel libsamplerate-devel libsndfile-devel id3lib-devel libvorbis-devel flac-devel pam-devel soundtouch-devel twolame-devel libmad-devel lame-devel rpm-build createrepo fop docbook5-style-xsl libxslt kernel-devel rpm-sign man-pages openssl-devel taglib-devel libmusicbrainz5-devel libdiscid-devel libcoverart libcoverart-devel ImageMagick-c++-devel Configure script invocation: ./configure --prefix=/usr --libdir=/usr/lib64 --libexecdir=/var/www/rd-bin --sysconfdir=/etc/httpd/conf.d diff --git a/cae/Makefile.am b/cae/Makefile.am index 06c36dba..049187eb 100644 --- a/cae/Makefile.am +++ b/cae/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -50,7 +50,8 @@ caed_LDADD = @LIB_RDLIBS@\ @LIBSRC@\ @LIBVORBIS@\ @QT5_LIBS@\ - @MUSICBRAINZ_LIBS@ + @MUSICBRAINZ_LIBS@\ + @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ moc_* diff --git a/configure.ac b/configure.ac index 1b58b3fb..3c5340b7 100644 --- a/configure.ac +++ b/configure.ac @@ -325,6 +325,11 @@ AC_CHECK_HEADER(security/pam_appl.h,[],[AC_MSG_ERROR([*** PAM not found ***])]) # AC_CHECK_HEADER(soundtouch/SoundTouch.h,[],[AC_MSG_ERROR([*** SoundTouch not found ***])]) +# +# Check for ImageMagick +# +PKG_CHECK_MODULES(IMAGEMAGICK,Magick++-6.Q16,[],[AC_MSG_ERROR([*** ImageMagick 6 Magick++ binding not found ***])]) + # # Check for Python # diff --git a/docs/tables/feed_images.txt b/docs/tables/feed_images.txt index ede19257..ecd0f702 100644 --- a/docs/tables/feed_images.txt +++ b/docs/tables/feed_images.txt @@ -13,4 +13,7 @@ HEIGHT int(11) signed Pixels DEPTH int(11) signed Bits/pixel DESCRIPTION varchar(191) FILE_EXTENSION varchar(10) -DATA longblob +DATA longblob Data for full-size image +DATA_MID_THUMB longblob Data for image, scaled to 32x32 +DATA_SMALL_THUMB longblob Data for image, scaled to 22x22 + diff --git a/importers/Makefile.am b/importers/Makefile.am index f906474e..a48ce3e7 100644 --- a/importers/Makefile.am +++ b/importers/Makefile.am @@ -2,7 +2,7 @@ ## ## Automake.am for rivendell/importers ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -36,23 +36,23 @@ bin_PROGRAMS = nexgen_filter\ dist_nexgen_filter_SOURCES = nexgen_filter.cpp nexgen_filter.h nodist_nexgen_filter_SOURCES = moc_nexgen_filter.cpp -nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +nexgen_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_panel_copy_SOURCES = panel_copy.cpp panel_copy.h nodist_panel_copy_SOURCES = moc_panel_copy.cpp -panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +panel_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_rdcatch_copy_SOURCES = rdcatch_copy.cpp rdcatch_copy.h nodist_rdcatch_copy_SOURCES = moc_rdcatch_copy.cpp -rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcatch_copy_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_rivendell_filter_SOURCES = rivendell_filter.cpp rivendell_filter.h nodist_rivendell_filter_SOURCES = moc_rivendell_filter.cpp -rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rivendell_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_wings_filter_SOURCES = wings_filter.cpp wings_filter.h nodist_wings_filter_SOURCES = moc_wings_filter.cpp -wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +wings_filter_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = export_slax diff --git a/lib/Makefile.am b/lib/Makefile.am index a599b501..e0ddf971 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++11 -fPIC -I/usr/include/taglib +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++11 -fPIC -I/usr/include/taglib @IMAGEMAGICK_CFLAGS@ MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -156,6 +156,7 @@ dist_librd_la_SOURCES = dbversion.h\ rdhostvarlistmodel.cpp rdhostvarlistmodel.h\ rdidvalidator.cpp rdidvalidator.h\ rdiconengine.cpp rdiconengine.h\ + rdimagemagick.cpp rdimagemagick.h\ rdimagepickerbox.cpp rdimagepickerbox.h\ rdimagepickermodel.cpp rdimagepickermodel.h\ rdimport_audio.cpp rdimport_audio.h\ diff --git a/lib/dbversion.h b/lib/dbversion.h index ee684420..d1b7c0fd 100644 --- a/lib/dbversion.h +++ b/lib/dbversion.h @@ -24,7 +24,7 @@ /* * Current Database Version */ -#define RD_VERSION_DATABASE 364 +#define RD_VERSION_DATABASE 365 #endif // DBVERSION_H diff --git a/lib/librd.pro b/lib/librd.pro index 081ef5e8..5811d099 100644 --- a/lib/librd.pro +++ b/lib/librd.pro @@ -120,6 +120,7 @@ SOURCES += rdhash.cpp SOURCES += rdhostvarlistmodel.cpp SOURCES += rdidvalidator.cpp SOURCES += rdiconengine.cpp +SOURCES += rdimagemagick.cpp SOURCES += rdimagepickerbox.cpp SOURCES += rdimagepickermodel.cpp SOURCES += rdimport_audio.cpp @@ -310,6 +311,7 @@ HEADERS += rdhash.h HEADERS += rdhostvarlistmodel.h HEADERS += rdiconengine.h HEADERS += rdidvalidator.h +HEADERS += rdimagemagick.h HEADERS += rdimagepickerbox.h HEADERS += rdimagepickermodel.h HEADERS += rdimport_audio.h diff --git a/lib/rd.h b/lib/rd.h index 58b67cfb..ac6f7edd 100644 --- a/lib/rd.h +++ b/lib/rd.h @@ -654,6 +654,12 @@ #define RD_LISTWIDGET_ITEM_HEIGHT 25 #define RD_LISTWIDGET_ITEM_WIDTH_PADDING 20 +/* + * Thumbnail image sizes + */ +#define RD_MID_THUMB_SIZE QSize(32,32) +#define RD_SMALL_THUMB_SIZE QSize(22,22) + /* * Date/Time Formats */ diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index ae7350c4..cacb57f8 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -33,6 +33,7 @@ #include "rddelete.h" #include "rdescape_string.h" #include "rdfeed.h" +#include "rdimagemagick.h" #include "rdlibrary_conf.h" #include "rdlog.h" #include "rdpodcast.h" @@ -754,10 +755,6 @@ int RDFeed::importImageFile(const QString &pathname,QString *err_msg, desc=tr("Imported from")+" "+pathname; } - // - // FIXME: Upload to remote file store here... - // - // // Write it to the DB // @@ -770,10 +767,14 @@ int RDFeed::importImageFile(const QString &pathname,QString *err_msg, QString::asprintf("`DEPTH`=%d,",img->depth())+ "`DESCRIPTION`='"+RDEscapeString(desc)+"',"+ "`FILE_EXTENSION`='"+RDEscapeString(f0.last().toLower())+"',"+ - "`DATA`="+RDEscapeBlob(data); + "`DATA`="+RDEscapeBlob(data)+","+ + "`DATA_MID_THUMB`="+ + RDEscapeBlob(RDIMResizeImage(data,RD_MID_THUMB_SIZE))+","+ + "`DATA_SMALL_THUMB`="+ + RDEscapeBlob(RDIMResizeImage(data,RD_SMALL_THUMB_SIZE)); ret=RDSqlQuery::run(sql,&ok).toInt(); if(!ok) { - *err_msg="Unable to write to database"; + *err_msg="Unable to write images to database"; return -1; } diff --git a/lib/rdfeedlistmodel.cpp b/lib/rdfeedlistmodel.cpp index 07ead41e..7cc4d9be 100644 --- a/lib/rdfeedlistmodel.cpp +++ b/lib/rdfeedlistmodel.cpp @@ -563,9 +563,12 @@ void RDFeedListModel::updateRow(int row,RDSqlQuery *q) applicationIcon(RDIconEngine::RdCastManager,32); } else { + d_icons[row][0]=QImage::fromData(q->value(12).toByteArray()); + /* d_icons[row][0]= QImage::fromData(q->value(12).toByteArray()). scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); + */ } d_texts[row][1]=q->value(2); // Title if(q->value(4).toString()=="Y") { @@ -646,7 +649,7 @@ QString RDFeedListModel::sqlFields() const "`PODCASTS`.`ITEM_TITLE`,"+ // 09 "`PODCASTS`.`STATUS`,"+ // 10 "`PODCASTS`.`ORIGIN_DATETIME`,"+ // 11 - "`FEED_IMAGES`.`DATA` "+ // 12 + "`FEED_IMAGES`.`DATA_MID_THUMB` "+ // 12 "from `FEEDS` left join `FEED_IMAGES` "+ "on `FEEDS`.`CHANNEL_IMAGE_ID`=`FEED_IMAGES`.`ID` left join `PODCASTS` "+ "on `FEEDS`.`ID`=`PODCASTS`.`FEED_ID` "; diff --git a/lib/rdimagemagick.cpp b/lib/rdimagemagick.cpp new file mode 100644 index 00000000..7f3635ca --- /dev/null +++ b/lib/rdimagemagick.cpp @@ -0,0 +1,35 @@ +// rdimagemagick.cpp +// +// ImageMagick operations for Rivendell +// +// (C) Copyright 2022 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#include + +#include "rdimagemagick.h" + +QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size) +{ + Magick::Image img(Magick::Blob(src_image.constData(),src_image.size())); + Magick::Geometry dst_size(size.width(),size.height()); + Magick::Blob dst_blob; + + img.zoom(Magick::Geometry(size.width(),size.height())); + img.write(&dst_blob); + + return QByteArray((const char *)dst_blob.data(),dst_blob.length()); +} diff --git a/lib/rdimagemagick.h b/lib/rdimagemagick.h new file mode 100644 index 00000000..83b04c3e --- /dev/null +++ b/lib/rdimagemagick.h @@ -0,0 +1,30 @@ +// rdimagemagick.h +// +// ImageMagick operations for Rivendell +// +// (C) Copyright 2022 Fred Gleason +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// + +#ifndef RDIMAGEMAGICK_H +#define RDIMAGEMAGICK_H + +#include +#include + +QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size); + + +#endif // RDIMAGEMAGICK_H diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am index 0cabab92..86d114c9 100644 --- a/rdadmin/Makefile.am +++ b/rdadmin/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap @@ -210,7 +210,7 @@ nodist_rdadmin_SOURCES = global_credits.c\ moc_view_node_info.cpp\ moc_view_pypad_errors.cpp -rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdadmin_LDADD = @LIB_RDLIBS@ -lsamplerate @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = gpl2.html\ info_banner1.xpm\ diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am index f97d8ba9..27d62aae 100644 --- a/rdairplay/Makefile.am +++ b/rdairplay/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -78,7 +78,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\ moc_voicetracker.cpp\ moc_wall_clock.cpp -rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ rdairplay_LDFLAGS = -rdynamic EXTRA_DIST = rdairplay.pro\ diff --git a/rdcartslots/Makefile.am b/rdcartslots/Makefile.am index 43223370..b1298c41 100644 --- a/rdcartslots/Makefile.am +++ b/rdcartslots/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -45,7 +45,7 @@ dist_rdcartslots_SOURCES = local_macros.cpp\ nodist_rdcartslots_SOURCES = moc_rdcartslots.cpp -rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcartslots_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdcartslots.pro\ rdcartslots_de.ts\ diff --git a/rdcastmanager/Makefile.am b/rdcastmanager/Makefile.am index f146e57b..a0c0831d 100644 --- a/rdcastmanager/Makefile.am +++ b/rdcastmanager/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -53,7 +53,7 @@ nodist_rdcastmanager_SOURCES = moc_edit_cast.cpp\ moc_rdcastmanager.cpp\ moc_render_dialog.cpp -rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcastmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdcastmanager.pro\ rdcastmanager_cs.ts\ diff --git a/rdcatch/Makefile.am b/rdcatch/Makefile.am index c65c63fc..7a881641 100644 --- a/rdcatch/Makefile.am +++ b/rdcatch/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -77,7 +77,7 @@ nodist_rdcatch_SOURCES = moc_add_recording.cpp\ moc_vbox.cpp -rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcatch_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdcatch.pro\ diff --git a/rdcatch/edit_upload.cpp b/rdcatch/edit_upload.cpp index 727de7f1..37311d30 100644 --- a/rdcatch/edit_upload.cpp +++ b/rdcatch/edit_upload.cpp @@ -74,16 +74,10 @@ EditUpload::EditUpload(QString *filter,QWidget *parent) edit_feed_label=new QLabel(tr("RSS Feed:"),this); edit_feed_label->setFont(labelFont()); edit_feed_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - /* - * FIXME: Causes Broken pipe errors with large DBs. Why? - * edit_feed_model=new RDFeedListModel(true,true,this); edit_feed_model->setFont(defaultFont()); edit_feed_box->setModel(edit_feed_model); - */ edit_feed_box->insertItem(0,tr("[none]")); - edit_feed_label->setDisabled(true); - edit_feed_box->setDisabled(true); // // Url @@ -612,10 +606,6 @@ void EditUpload::Save() edit_recording->setNormalizationLevel(1); } - // - // FIXME: The indexing schema for feeds is lame and fundamentally broken. - // - /* int feed_id=edit_feed_model-> feedId(edit_feed_model->index(edit_feed_box->currentIndex(),0)); if(feed_id==0) { @@ -624,7 +614,6 @@ void EditUpload::Save() else { edit_recording->setFeedId(feed_id); } - */ } diff --git a/rdcatch/edit_upload.h b/rdcatch/edit_upload.h index a3a20e34..61bcc6e1 100644 --- a/rdcatch/edit_upload.h +++ b/rdcatch/edit_upload.h @@ -76,7 +76,7 @@ class EditUpload : public RDDialog EventWidget *edit_event_widget; QLabel *edit_feed_label; QComboBox *edit_feed_box; - // RDFeedListModel *edit_feed_model; + RDFeedListModel *edit_feed_model; QLabel *edit_description_label; QLineEdit *edit_description_edit; QPushButton *edit_source_select_button; diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 4e0d63a1..de4ebd1d 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -298,6 +298,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) } delete q; + QTime start=QTime::currentTime(); + // // Cart List // diff --git a/rdcatch/recordlistmodel.cpp b/rdcatch/recordlistmodel.cpp index 223053fe..a0509ac7 100644 --- a/rdcatch/recordlistmodel.cpp +++ b/rdcatch/recordlistmodel.cpp @@ -538,7 +538,7 @@ void RecordListModel::updateModel(const QString &filter_sql) d_feed_images.clear(); sql=QString("select ")+ "`ID`,"+ // 00 - "`DATA` "+ // 01 + "`DATA_SMALL_THUMB` "+ // 01 "from `FEED_IMAGES`"; q=new RDSqlQuery(sql); while(q->next()) { @@ -546,9 +546,13 @@ void RecordListModel::updateModel(const QString &filter_sql) d_feed_images[q->value(0).toUInt()]=QVariant(); } else { + /* d_feed_images[q->value(0).toUInt()]= QImage::fromData(q->value(1).toByteArray()). scaled(22,22,Qt::IgnoreAspectRatio,Qt::SmoothTransformation); + */ + d_feed_images[q->value(0).toUInt()]= + QImage::fromData(q->value(1).toByteArray()); } } delete q; diff --git a/rdcatchd/Makefile.am b/rdcatchd/Makefile.am index b08ed271..ed4dfdeb 100644 --- a/rdcatchd/Makefile.am +++ b/rdcatchd/Makefile.am @@ -20,7 +20,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -39,7 +39,7 @@ dist_rdcatchd_SOURCES = batch.cpp\ nodist_rdcatchd_SOURCES = moc_event_player.cpp\ moc_rdcatchd.cpp -rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcatchd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ moc_* diff --git a/rdhpi/Makefile.am b/rdhpi/Makefile.am index 45ce3fd4..962ad502 100644 --- a/rdhpi/Makefile.am +++ b/rdhpi/Makefile.am @@ -21,7 +21,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ CWRAP = ../helpers/cwrap diff --git a/rdlibrary/Makefile.am b/rdlibrary/Makefile.am index 52e084e4..1ff5575b 100644 --- a/rdlibrary/Makefile.am +++ b/rdlibrary/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -75,7 +75,7 @@ nodist_rdlibrary_SOURCES = moc_audio_cart.cpp\ moc_rdlibrary.cpp\ moc_record_cut.cpp -rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdlibrary_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdlibrary.pro\ rdlibrary_cs.ts\ diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am index 5d4d6ff3..54fd1289 100644 --- a/rdlogedit/Makefile.am +++ b/rdlogedit/Makefile.am @@ -18,7 +18,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ## -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -66,7 +66,7 @@ nodist_rdlogedit_SOURCES = moc_add_meta.cpp\ moc_render_dialog.cpp\ moc_voice_tracker.cpp -rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdlogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdlogedit.pro\ rdlogedit_cs.ts\ diff --git a/rdlogin/Makefile.am b/rdlogin/Makefile.am index 7dd71388..d713afda 100644 --- a/rdlogin/Makefile.am +++ b/rdlogin/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -42,7 +42,7 @@ dist_rdlogin_SOURCES = rdlogin.cpp rdlogin.h nodist_rdlogin_SOURCES = moc_rdlogin.cpp -rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdlogin_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdlogin.pro\ rdlogin_cs.ts\ diff --git a/rdlogmanager/Makefile.am b/rdlogmanager/Makefile.am index 9900c3ef..5a7f2330 100644 --- a/rdlogmanager/Makefile.am +++ b/rdlogmanager/Makefile.am @@ -18,7 +18,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -101,7 +101,7 @@ nodist_rdlogmanager_SOURCES = moc_add_clock.cpp\ moc_svc_rec_dialog.cpp\ moc_viewreportdialog.cpp -rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdlogmanager_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdlogmanager.pro\ rdlogmanager_cs.ts\ diff --git a/rdmonitor/Makefile.am b/rdmonitor/Makefile.am index 56a9ff1a..086ba8a5 100644 --- a/rdmonitor/Makefile.am +++ b/rdmonitor/Makefile.am @@ -18,7 +18,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -44,7 +44,7 @@ dist_rdmonitor_SOURCES = positiondialog.cpp positiondialog.h\ nodist_rdmonitor_SOURCES = moc_positiondialog.cpp\ moc_rdmonitor.cpp -rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdmonitor.pro\ rdmonitor_cs.ts\ diff --git a/rdpadd/Makefile.am b/rdpadd/Makefile.am index b228558d..f0d89e87 100644 --- a/rdpadd/Makefile.am +++ b/rdpadd/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell PAD Consolidation Server ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -35,7 +35,7 @@ dist_rdpadd_SOURCES = rdpadd.cpp rdpadd.h nodist_rdpadd_SOURCES = moc_rdpadd.cpp -rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdpadd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/rdpadengined/Makefile.am b/rdpadengined/Makefile.am index 4d9d1920..9973f8cf 100644 --- a/rdpadengined/Makefile.am +++ b/rdpadengined/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell PyPAD Script Host ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -35,7 +35,7 @@ dist_rdpadengined_SOURCES = rdpadengined.cpp rdpadengined.h nodist_rdpadengined_SOURCES = moc_rdpadengined.cpp -rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdpadengined_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/rdpanel/Makefile.am b/rdpanel/Makefile.am index 5852ce64..8b3ffe8e 100644 --- a/rdpanel/Makefile.am +++ b/rdpanel/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -43,7 +43,7 @@ dist_rdpanel_SOURCES = globals.h\ nodist_rdpanel_SOURCES = moc_rdpanel.cpp -rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdpanel_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdpanel.pro\ rdpanel_cs.ts\ diff --git a/rdrepld/Makefile.am b/rdrepld/Makefile.am index 6c5e3ee1..28ccadd7 100644 --- a/rdrepld/Makefile.am +++ b/rdrepld/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2010-2021 Fred Gleason +## (C) Copyright 2010-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -32,7 +32,7 @@ dist_rdrepld_SOURCES = rdrepld.cpp rdrepld.h \ replfactory.cpp replfactory.h\ citadelxds.cpp citadelxds.h nodist_rdrepld_SOURCES = moc_rdrepld.cpp -rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~ moc_* DISTCLEANFILES = moc_* diff --git a/rdrssd/Makefile.am b/rdrssd/Makefile.am index ae28e7f2..e6063075 100644 --- a/rdrssd/Makefile.am +++ b/rdrssd/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell RSS Processor Service ## -## (C) Copyright 2020-2021 Fred Gleason +## (C) Copyright 2020-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -35,7 +35,7 @@ dist_rdrssd_SOURCES = rdrssd.cpp rdrssd.h nodist_rdrssd_SOURCES = moc_rdrssd.cpp -rdrssd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdrssd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/rdselect/Makefile.am b/rdselect/Makefile.am index 3ed2acb1..d103e599 100644 --- a/rdselect/Makefile.am +++ b/rdselect/Makefile.am @@ -18,7 +18,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -46,7 +46,7 @@ dist_rdselect_SOURCES = rdselect.cpp rdselect.h nodist_rdselect_SOURCES = moc_rdselect.cpp -rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rd.audiostore.autofs\ rdselect.pro\ diff --git a/rdservice/Makefile.am b/rdservice/Makefile.am index b0e85b3b..1fe1fc3b 100644 --- a/rdservice/Makefile.am +++ b/rdservice/Makefile.am @@ -2,7 +2,7 @@ ## ## Rivendell Services Manager ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -38,7 +38,7 @@ dist_rdservice_SOURCES = maint_routines.cpp\ nodist_rdservice_SOURCES = moc_rdservice.cpp -rdservice_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdservice_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ moc_* diff --git a/rdvairplayd/Makefile.am b/rdvairplayd/Makefile.am index d6e368b6..81186df2 100644 --- a/rdvairplayd/Makefile.am +++ b/rdvairplayd/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -32,7 +32,7 @@ dist_rdvairplayd_SOURCES = local_macros.cpp\ nodist_rdvairplayd_SOURCES = moc_rdvairplayd.cpp -rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdvairplayd_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/ripcd/Makefile.am b/ripcd/Makefile.am index 6c2bcff4..01140cfb 100644 --- a/ripcd/Makefile.am +++ b/ripcd/Makefile.am @@ -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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -134,7 +134,8 @@ ripcd_LDADD = @LIB_RDLIBS@\ @QT5_LIBS@\ @LIBHPI@\ @LIBJACK@\ - @MUSICBRAINZ_LIBS@ + @MUSICBRAINZ_LIBS@\ + @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/rivendell.spec.in b/rivendell.spec.in index 81440aac..d8529398 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -507,7 +507,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/wings_filter %{_bindir}/rivendell_filter %{_bindir}/nexgen_filter -%{_bindir}/sas_filter %{_bindir}/crc-unity4k.sh %{_bindir}/rdcatch_copy %{_bindir}/panel_copy diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d622de5..f0aa2da5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -61,114 +61,114 @@ noinst_PROGRAMS = audio_convert_test\ wavewidget_test dist_audio_convert_test_SOURCES = audio_convert_test.cpp audio_convert_test.h -audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +audio_convert_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_audio_export_test_SOURCES = audio_export_test.cpp audio_export_test.h -audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +audio_export_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_audio_import_test_SOURCES = audio_import_test.cpp audio_import_test.h -audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +audio_import_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_audio_metadata_test_SOURCES = audio_metadata_test.cpp audio_metadata_test.h -audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +audio_metadata_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_audio_peaks_test_SOURCES = audio_peaks_test.cpp audio_peaks_test.h -audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +audio_peaks_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_cmdline_parser_test_SOURCES = cmdline_parser_test.cpp cmdline_parser_test.h -cmdline_parser_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +cmdline_parser_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_datedecode_test_SOURCES = datedecode_test.cpp datedecode_test.h -datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +datedecode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_dateparse_test_SOURCES = dateparse_test.cpp dateparse_test.h -dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +dateparse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_db_charset_test_SOURCES = db_charset_test.cpp db_charset_test.h -db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +db_charset_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_delete_test_SOURCES = delete_test.cpp delete_test.h -delete_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +delete_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_download_test_SOURCES = download_test.cpp download_test.h -download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +download_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_feed_image_test_SOURCES = feed_image_test.cpp feed_image_test.h -feed_image_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +feed_image_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_getpids_test_SOURCES = getpids_test.cpp getpids_test.h -getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +getpids_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_log_unlink_test_SOURCES = log_unlink_test.cpp log_unlink_test.h nodist_log_unlink_test_SOURCES = moc_log_unlink_test.cpp -log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +log_unlink_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_metadata_wildcard_test_SOURCES = metadata_wildcard_test.cpp metadata_wildcard_test.h nodist_metadata_wildcard_test_SOURCES = moc_metadata_wildcard_test.cpp -metadata_wildcard_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +metadata_wildcard_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_meterstrip_test_SOURCES = meterstrip_test.cpp meterstrip_test.h nodist_meterstrip_test_SOURCES = moc_meterstrip_test.cpp -meterstrip_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +meterstrip_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_mcast_recv_test_SOURCES = mcast_recv_test.cpp mcast_recv_test.h nodist_mcast_recv_test_SOURCES = moc_mcast_recv_test.cpp -mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +mcast_recv_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_notification_test_SOURCES = notification_test.cpp notification_test.h nodist_notification_test_SOURCES = moc_notification_test.cpp -notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +notification_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@@IMAGEMAGICK_LIBS@ dist_rdwavefile_test_SOURCES = rdwavefile_test.cpp rdwavefile_test.h nodist_rdwavefile_test_SOURCES = moc_rdwavefile_test.cpp -rdwavefile_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdwavefile_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@@IMAGEMAGICK_LIBS@ dist_rdxml_parse_test_SOURCES = rdxml_parse_test.cpp rdxml_parse_test.h -rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdxml_parse_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_readcd_test_SOURCES = readcd_test.cpp readcd_test.h -readcd_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +readcd_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_reserve_carts_test_SOURCES = reserve_carts_test.cpp reserve_carts_test.h -reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +reserve_carts_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_sendmail_test_SOURCES = sendmail_test.cpp sendmail_test.h -sendmail_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +sendmail_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h -stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_test_hash_SOURCES = test_hash.cpp test_hash.h -test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +test_hash_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_test_pam_SOURCES = test_pam.cpp test_pam.h -test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +test_pam_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_timer_test_SOURCES = timer_test.cpp timer_test.h nodist_timer_test_SOURCES = moc_timer_test.cpp -timer_test_LDADD = @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +timer_test_LDADD = @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_timeengine_test_SOURCES = timeengine_test.cpp timeengine_test.h nodist_timeengine_test_SOURCES = moc_timeengine_test.cpp -timeengine_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +timeengine_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_upload_test_SOURCES = upload_test.cpp upload_test.h -upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +upload_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_wav_chunk_test_SOURCES = wav_chunk_test.cpp wav_chunk_test.h -wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +wav_chunk_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_wavefactory_test_SOURCES = wavefactory_test.cpp wavefactory_test.h nodist_wavefactory_test_SOURCES = moc_wavefactory_test.cpp -wavefactory_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +wavefactory_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_wavescene_test_SOURCES = wavescene_test.cpp wavescene_test.h nodist_wavescene_test_SOURCES = moc_wavescene_test.cpp -wavescene_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +wavescene_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ dist_wavewidget_test_SOURCES = wavewidget_test.cpp wavewidget_test.h nodist_wavewidget_test_SOURCES = moc_wavewidget_test.cpp -wavewidget_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +wavewidget_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rivendell_standard.txt\ visualtraffic.txt diff --git a/utils/rdalsaconfig/Makefile.am b/utils/rdalsaconfig/Makefile.am index 34015e0c..62f5d1df 100644 --- a/utils/rdalsaconfig/Makefile.am +++ b/utils/rdalsaconfig/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009-2021 Fred Gleason +## (C) Copyright 2009-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,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 -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -36,7 +36,7 @@ dist_rdalsaconfig_SOURCES = alsaitem.cpp alsaitem.h\ nodist_rdalsaconfig_SOURCES = moc_rdalsamodel.cpp\ moc_rdalsaconfig.cpp -rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdalsaconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdalsaconfig.pro diff --git a/utils/rdcheckcuts/Makefile.am b/utils/rdcheckcuts/Makefile.am index 32e216ed..5c2bfdd2 100644 --- a/utils/rdcheckcuts/Makefile.am +++ b/utils/rdcheckcuts/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2012-2021 Fred Gleason +## (C) Copyright 2012-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdcheckcuts dist_rdcheckcuts_SOURCES = rdcheckcuts.cpp rdcheckcuts.h -rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcheckcuts_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdcleandirs/Makefile.am b/utils/rdcleandirs/Makefile.am index df7b8bda..1ff524d2 100644 --- a/utils/rdcleandirs/Makefile.am +++ b/utils/rdcleandirs/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2015-2021 Fred Gleason +## (C) Copyright 2015-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ sbin_PROGRAMS = rdcleandirs dist_rdcleandirs_SOURCES = rdcleandirs.cpp rdcleandirs.h -rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcleandirs_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.exe\ diff --git a/utils/rdclilogedit/Makefile.am b/utils/rdclilogedit/Makefile.am index c845fb42..5f1e7350 100644 --- a/utils/rdclilogedit/Makefile.am +++ b/utils/rdclilogedit/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2016-2021 Fred Gleason +## (C) Copyright 2016-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -34,7 +34,7 @@ dist_rdclilogedit_SOURCES = help.cpp\ nodist_rdclilogedit_SOURCES = moc_rdclilogedit.cpp -rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdclilogedit_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdcollect/Makefile.am b/utils/rdcollect/Makefile.am index 98a3f160..150cf329 100644 --- a/utils/rdcollect/Makefile.am +++ b/utils/rdcollect/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdcollect dist_rdcollect_SOURCES = rdcollect.cpp rdcollect.h -rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdcollect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.exe\ diff --git a/utils/rdconvert/Makefile.am b/utils/rdconvert/Makefile.am index 54062e8d..e35d5d90 100644 --- a/utils/rdconvert/Makefile.am +++ b/utils/rdconvert/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2021 Fred Gleason +## (C) Copyright 2017-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdconvert dist_rdconvert_SOURCES = rdconvert.cpp rdconvert.h -rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdconvert_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.exe\ diff --git a/utils/rddbconfig/Makefile.am b/utils/rddbconfig/Makefile.am index 1e10b246..041fd7a2 100644 --- a/utils/rddbconfig/Makefile.am +++ b/utils/rddbconfig/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009-2021 Fred Gleason +## (C) Copyright 2009-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -18,7 +18,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 -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib -I$(top_srcdir)/rdhpi @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib -L$(top_srcdir)/rdhpi MOC = @QT_MOC@ @@ -33,7 +33,7 @@ dist_rddbconfig_SOURCES = rddbconfig.cpp rddbconfig.h mysql_login.cpp mysql_logi nodist_rddbconfig_SOURCES = moc_rddbconfig.cpp moc_mysql_login.cpp -rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rddbconfig_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @LIBALSA@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.qm\ diff --git a/utils/rddbmgr/Makefile.am b/utils/rddbmgr/Makefile.am index 3c77ba40..e9bc901f 100644 --- a/utils/rddbmgr/Makefile.am +++ b/utils/rddbmgr/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -fno-var-tracking-assignments -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -36,7 +36,7 @@ dist_rddbmgr_SOURCES = check.cpp\ schemamap.cpp\ updateschema.cpp -rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rddbmgr_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.exe\ diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp index d9a07fdd..cb0f6185 100644 --- a/utils/rddbmgr/revertschema.cpp +++ b/utils/rddbmgr/revertschema.cpp @@ -41,6 +41,16 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // NEW SCHEMA REVERSIONS GO HERE... + // + // Revert 365 + // + if((cur_schema==365)&&(set_schema #include #include +#include #include #include "rddbmgr.h" @@ -11279,6 +11280,40 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) WriteSchemaVersion(++cur_schema); } + if((cur_schema<365)&&(set_schema>cur_schema)) { + sql=QString("alter table `FEED_IMAGES` ")+ + "add column `DATA_MID_THUMB` longblob after `DATA`"; + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("alter table `FEED_IMAGES` ")+ + "add column `DATA_SMALL_THUMB` longblob after `DATA_MID_THUMB`"; + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("select ")+ + "`ID`,"+ // 00 + "`DATA` "+ // 01 + "from `FEED_IMAGES`"; + q=new RDSqlQuery(sql); + while(q->next()) { + sql=QString("update `FEED_IMAGES` set ")+ + "`DATA_MID_THUMB`="+ + RDEscapeBlob(RDIMResizeImage(q->value(1).toByteArray(), + RD_MID_THUMB_SIZE))+","+ + "`DATA_SMALL_THUMB`="+ + RDEscapeBlob(RDIMResizeImage(q->value(1).toByteArray(), + RD_SMALL_THUMB_SIZE))+" "+ + QString::asprintf("where `ID`=%u",q->value(0).toUInt()); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + } + delete q; + + WriteSchemaVersion(++cur_schema); + } + // NEW SCHEMA UPDATES GO HERE... diff --git a/utils/rddelete/Makefile.am b/utils/rddelete/Makefile.am index 3bda32ef..9c49a9ad 100644 --- a/utils/rddelete/Makefile.am +++ b/utils/rddelete/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rddelete_SOURCES = rddelete.cpp rddelete.h nodist_rddelete_SOURCES = moc_rddelete.cpp -rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rddelete_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdexport/Makefile.am b/utils/rdexport/Makefile.am index 58d2ea67..30651f30 100644 --- a/utils/rdexport/Makefile.am +++ b/utils/rdexport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2016-2021 Fred Gleason +## (C) Copyright 2016-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\"-Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdexport_SOURCES = rdexport.cpp rdexport.h nodist_rdexport_SOURCES = moc_rdexport.cpp -rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdexport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdgpimon/Makefile.am b/utils/rdgpimon/Makefile.am index 7048d3c1..2d1d3c0e 100644 --- a/utils/rdgpimon/Makefile.am +++ b/utils/rdgpimon/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -43,7 +43,7 @@ dist_rdgpimon_SOURCES = gpi_label.cpp gpi_label.h\ nodist_rdgpimon_SOURCES = moc_gpi_label.cpp\ moc_rdgpimon.cpp -rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdgpimon.pro\ rdgpimon_cs.ts\ diff --git a/utils/rdimport/Makefile.am b/utils/rdimport/Makefile.am index 1ca84491..1dbc847d 100644 --- a/utils/rdimport/Makefile.am +++ b/utils/rdimport/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -33,7 +33,7 @@ dist_rdimport_SOURCES = journal.cpp journal.h\ nodist_rdimport_SOURCES = moc_rdimport.cpp -rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdmaint/Makefile.am b/utils/rdmaint/Makefile.am index e474ae72..491ed3f5 100644 --- a/utils/rdmaint/Makefile.am +++ b/utils/rdmaint/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2008-2021 Fred Gleason +## (C) Copyright 2008-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h nodist_rdmaint_SOURCES = moc_rdmaint.cpp -rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdmarkerset/Makefile.am b/utils/rdmarkerset/Makefile.am index 9f3c73f3..bccda5b5 100644 --- a/utils/rdmarkerset/Makefile.am +++ b/utils/rdmarkerset/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmarkerset_SOURCES = rdmarkerset.cpp rdmarkerset.h nodist_rdmarkerset_SOURCES = moc_rdmarkerset.cpp -rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdmarkerset_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = diff --git a/utils/rdmetadata/Makefile.am b/utils/rdmetadata/Makefile.am index 1811b359..37546b9c 100644 --- a/utils/rdmetadata/Makefile.am +++ b/utils/rdmetadata/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdmetadata_SOURCES = rdmetadata.cpp rdmetadata.h nodist_rdmetadata_SOURCES = moc_rdmetadata.cpp -rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdmetadata_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = diff --git a/utils/rdpopup/Makefile.am b/utils/rdpopup/Makefile.am index 05deb070..74d50366 100644 --- a/utils/rdpopup/Makefile.am +++ b/utils/rdpopup/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2009-2021 Fred Gleason +## (C) Copyright 2009-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -29,7 +29,7 @@ bin_PROGRAMS = rdpopup dist_rdpopup_SOURCES = rdpopup.cpp rdpopup.h -rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdrender/Makefile.am b/utils/rdrender/Makefile.am index e0ac598b..e84c71c6 100644 --- a/utils/rdrender/Makefile.am +++ b/utils/rdrender/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2021 Fred Gleason +## (C) Copyright 2017-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdrender_SOURCES = rdrender.cpp rdrender.h nodist_rdrender_SOURCES = moc_rdrender.cpp -rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdrender_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdselect_helper/Makefile.am b/utils/rdselect_helper/Makefile.am index 8e37418f..e0974a4d 100644 --- a/utils/rdselect_helper/Makefile.am +++ b/utils/rdselect_helper/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2018-2021 Fred Gleason +## (C) Copyright 2018-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,7 @@ ## ## Use automake to process this into a Makefile.in -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CLI_CFLAGS@ @MUSICBRAINZ_CFLAGS@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CLI_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ MOC = @QT_MOC@ # The dependency for qt's Meta Object Compiler (moc) @@ -36,7 +36,7 @@ nodist_rdselect_helper_SOURCES = moc_rdselect_helper.cpp\ rdconfig.cpp rdconfig.h\ rdprofile.cpp rdprofile.h -rdselect_helper_LDADD = @QT5_CLI_LIBS@ @MUSICBRAINZ_LIBS@ +rdselect_helper_LDADD = @QT5_CLI_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.idb\ diff --git a/utils/rdsoftkeys/Makefile.am b/utils/rdsoftkeys/Makefile.am index 0a792baf..6811ab79 100644 --- a/utils/rdsoftkeys/Makefile.am +++ b/utils/rdsoftkeys/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -31,7 +31,7 @@ dist_rdsoftkeys_SOURCES = rdsoftkeys.cpp rdsoftkeys.h nodist_rdsoftkeys_SOURCES = moc_rdsoftkeys.cpp -rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdsoftkeys_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ CLEANFILES = *~\ *.exe\ diff --git a/utils/rmlsend/Makefile.am b/utils/rmlsend/Makefile.am index 1f975cb9..2a4e75bf 100644 --- a/utils/rmlsend/Makefile.am +++ b/utils/rmlsend/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2002-2021 Fred Gleason +## (C) Copyright 2002-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -41,7 +41,7 @@ dist_rmlsend_SOURCES = rmlsend.cpp rmlsend.h nodist_rmlsend_SOURCES = moc_rmlsend.cpp -rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rmlsend_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rmlsend.pro\ rmlsend_cs.ts\ diff --git a/web/rdxport/Makefile.am b/web/rdxport/Makefile.am index facd71f6..7a652161 100644 --- a/web/rdxport/Makefile.am +++ b/web/rdxport/Makefile.am @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -51,7 +51,7 @@ dist_rdxport_cgi_SOURCES = audioinfo.cpp\ nodist_rdxport_cgi_SOURCES = moc_rdxport.cpp -rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +rdxport_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = rdxport.pro diff --git a/web/webget/Makefile.am b/web/webget/Makefile.am index 8ca2b176..ad9b4450 100644 --- a/web/webget/Makefile.am +++ b/web/webget/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am ## -## (C) Copyright 2017-2021 Fred Gleason +## (C) Copyright 2017-2022 Fred Gleason ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License version 2 as @@ -17,7 +17,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@ +AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@ LIBS = -L$(top_srcdir)/lib MOC = @QT_MOC@ @@ -41,7 +41,7 @@ dist_webget_cgi_SOURCES = webget.cpp webget.h nodist_webget_cgi_SOURCES = moc_webget.cpp -webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ +webget_cgi_LDADD = @LIB_RDLIBS@ -lsndfile @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ EXTRA_DIST = webget.js