diff options
74 files changed, 48743 insertions, 4152 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35b5f16df3..1d28d4b2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2343,16 +2343,16 @@ endif() # Live Broadcasting (Shoutcast) option(BROADCAST "Live Broadcasting (Shoutcast) support" ON) if(BROADCAST) - find_package(Shout) + find_package(Shoutidjc) if(UNIX AND NOT APPLE) # Check if system lib is at least 2.4.4 and not suffering bug # https://bugs.launchpad.net/mixxx/+bug/1833225 - if(Shout_FOUND AND Shout_VERSION VERSION_LESS 2.4.4) - message(STATUS "Installed libshout version: ${Shout_VERSION} is suffering from bug lp1833225") + if(Shoutidjc_FOUND AND Shoutidjc_VERSION VERSION_LESS 2.4.4) + message(STATUS "Installed libshout-idjc version: ${Shoutidjc_VERSION} is suffering from bug lp1833225") endif() - if(NOT Shout_FOUND OR Shout_VERSION VERSION_LESS 2.4.4) + if(NOT Shoutidjc_FOUND OR Shoutidjc_VERSION VERSION_LESS 2.4.4) # Fall back to internal libraray in the lib tree - message(STATUS "Using internal libshout") + message(STATUS "Using internal libshout-idjc") add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/lib/libshout-idjc") target_include_directories(mixxx-lib SYSTEM PUBLIC lib/libshout/include-idjc) target_link_libraries(mixxx-lib PUBLIC shout_mixxx) @@ -2361,9 +2361,9 @@ if(BROADCAST) endif() else() if(NOT Shout_FOUND) - message(FATAL_ERROR "Live Broadcasting support requires the libshout and its development headers.") + message(FATAL_ERROR "Live Broadcasting support requires the libshout-idjc and its development headers.") endif() - target_link_libraries(mixxx-lib PUBLIC Shout::Shout) + target_link_libraries(mixxx-lib PUBLIC Shoutidjc::Shoutidjc) endif() target_sources(mixxx-lib PRIVATE src/preferences/dialog/dlgprefbroadcastdlg.ui diff --git a/cmake/modules/FindShout.cmake b/cmake/modules/FindShout.cmake deleted file mode 100644 index b3fa8c09fd..0000000000 --- a/cmake/modules/FindShout.cmake +++ /dev/null @@ -1,89 +0,0 @@ -# This file is part of Mixxx, Digital DJ'ing software. -# Copyright (C) 2001-2020 Mixxx Development Team -# Distributed under the GNU General Public Licence (GPL) version 2 or any later -# later version. See the LICENSE file for details. - -#[=======================================================================[.rst: -FindShout ---------- - -Finds the Shout library. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module provides the following imported targets, if found: - -``Shout::Shout`` - The Shout library - -Result Variables -^^^^^^^^^^^^^^^^ - -This will define the following variables: - -``Shout_FOUND`` - True if the system has the Shout library. -``Shout_INCLUDE_DIRS`` - Include directories needed to use Shout. -``Shout_LIBRARIES`` - Libraries needed to link to Shout. -``Shout_DEFINITIONS`` - Compile definitions needed to use Shout. -``Shout_VERSION`` - Shout Version. - -Cache Variables -^^^^^^^^^^^^^^^ - -The following cache variables may also be set: - -``Shout_INCLUDE_DIR`` - The directory containing ``shout/shout.h``. -``Shout_LIBRARY`` - The path to the Shout library. - -#]=======================================================================] - -find_package(PkgConfig QUIET) -if(PkgConfig_FOUND) - pkg_check_modules(PC_Shout QUIET shout) -endif() - -find_path(Shout_INCLUDE_DIR - NAMES shout/shout.h - PATHS ${PC_Shout_INCLUDE_DIRS} - DOC "Shout include directory") -mark_as_advanced(Shout_INCLUDE_DIR) - -find_library(Shout_LIBRARY - NAMES shout - PATHS ${PC_Shout_LIBRARY_DIRS} - DOC "Shout library" -) -mark_as_advanced(Shout_LIBRARY) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - Shout - DEFAULT_MSG - Shout_LIBRARY - Shout_INCLUDE_DIR -) - -if(Shout_FOUND) - set(Shout_LIBRARIES "${Shout_LIBRARY}") - set(Shout_INCLUDE_DIRS "${Shout_INCLUDE_DIR}") - set(Shout_DEFINITIONS ${PC_Shout_CFLAGS_OTHER}) - set(Shout_VERSION ${PC_Shout_VERSION}) - - if(NOT TARGET Shout::Shout) - add_library(Shout::Shout UNKNOWN IMPORTED) - set_target_properties(Shout::Shout - PROPERTIES - IMPORTED_LOCATION "${Shout_LIBRARY}" - INTERFACE_COMPILE_OPTIONS "${PC_Shout_CFLAGS_OTHER}" - INTERFACE_INCLUDE_DIRECTORIES "${Shout_INCLUDE_DIR}" - ) - endif() -endif() diff --git a/cmake/modules/FindShoutidjc.cmake b/cmake/modules/FindShoutidjc.cmake new file mode 100644 index 0000000000..73b60d8879 --- /dev/null +++ b/cmake/modules/FindShoutidjc.cmake @@ -0,0 +1,89 @@ +# This file is part of Mixxx, Digital DJ'ing software. +# Copyright (C) 2001-2020 Mixxx Development Team +# Distributed under the GNU General Public Licence (GPL) version 2 or any later +# later version. See the LICENSE file for details. + +#[=======================================================================[.rst: +FindShoutidjc +--------- + +Finds the Shoutidjc library. + +Imported Targets +^^^^^^^^^^^^^^^^ + +This module provides the following imported targets, if found: + +``Shoutidjc::Shoutidjc`` + The Shout library + +Result Variables +^^^^^^^^^^^^^^^^ + +This will define the following variables: + +``Shout_FOUND`` + True if the system has the Shoutidjc library. +``Shoutidjc_INCLUDE_DIRS`` + Include directories needed to use Shoutidjc. +``Shoutidjc_LIBRARIES`` + Libraries needed to link to Shoutidjc. +``Shoutidjc_DEFINITIONS`` + Compile definitions needed to use Shoutidjc. +``Shoutidjc_VERSION`` + The Version of libshout-idjc. + +Cache Variables +^^^^^^^^^^^^^^^ + +The following cache variables may also be set: + +``Shoutidjc_INCLUDE_DIR`` + The directory containing ``shoutidjc/shout.h``. +``Shoutidjc_LIBRARY`` + The path to the Shout library. + +#]=======================================================================] + +find_package(PkgConfig QUIET) +if(PkgConfig_FOUND) + pkg_check_modules(PC_Shoutidjc QUIET shout-idjc) +endif() + +find_path(Shoutidjc_INCLUDE_DIR + NAMES shoutidjc/shout.h + PATHS ${PC_Shout_INCLUDE_DIRS} + DOC "Shout include directory") +mark_as_advanced(Shoutidjc_INCLUDE_DIR) + +find_library(Shoutidjc_LIBRARY + NAMES shout-idjc + PATHS ${PC_Shoutidjc_LIBRARY_DIRS} + DOC "Shoutidjc library" +) +mark_as_advanced(Shoutidjc_LIBRARY) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args( + Shoutidjc + DEFAULT_MSG + Shoutidjc_LIBRARY + Shoutidjc_INCLUDE_DIR +) + +if(Shoutidjc_FOUND) + set(Shoutidjc_LIBRARIES "${Shoutidjc_LIBRARY}") + set(Shoutidjc_INCLUDE_DIRS "${Shoutidjc_INCLUDE_DIR}") + set(Shoutidjc_DEFINITIONS ${PC_Shoutidjc_CFLAGS_OTHER}) + set(Shoutidjc_VERSION ${PC_Shoutidjc_VERSION}) + + if(NOT TARGET Shoutidjc::Shoutidjc) + add_library(Shoutidjc::Shoutidjc UNKNOWN IMPORTED) + set_target_properties(Shoutidjc::Shoutidjc + PROPERTIES + IMPORTED_LOCATION "${Shoutidjc_LIBRARY}" + INTERFACE_COMPILE_OPTIONS "${PC_Shoutidjc_CFLAGS_OTHER}" + INTERFACE_INCLUDE_DIRECTORIES "${Shoutidjc_INCLUDE_DIR}" + ) + endif() +endif() diff --git a/lib/libshout-idjc/CMakeLists.txt b/lib/libshout-idjc/CMakeLists.txt index 6b89c9496a..a8cec1e993 100644 --- a/lib/libshout-idjc/CMakeLists.txt +++ b/lib/libshout-idjc/CMakeLists.txt @@ -27,7 +27,7 @@ add_library(shout_mixxx STATIC src/proto_roaraudio.c src/format_ogg.c src/format_webm.c - src/format_mp3.c + src/format_mpeg.c src/codec_vorbis.c src/codec_opus.c src/tls.c diff --git a/lib/libshout-idjc/HACKING b/lib/libshout-idjc/HACKING deleted file mode 100644 index 3187e8d5d5..0000000000 --- a/lib/libshout-idjc/HACKING +++ /dev/null @@ -1,48 +0,0 @@ -Note that these instructions are *not* necessary for distribution -tarballs; they have separate configure/build instructions. - -Building this package from subversion is mainly intended for developers. -General users should obtain official distribution packages; both -source and binary distributions are available at -http://www.icecast.org/ - ------ - -These are *brief* instructions on how to build this package from subversion. -Yes, there are details left out. - -There are generally four steps necessary when building from subversion (i.e., -a developer's copy): - -1. svn checkout of the sources, or svn update. RTFM from your - favorite flavor of svn documentation; information on the xiph.org - svn repository can be found at http://www.xiph.org/svn/. - -2. [re-]generate files such as "configure" and "Makefile.in" with the - GNU autoconf/automake tools. Run the "autogen.sh" script to - perform this step. - - *** IF YOU ARE NOT BUILDING WITH GNU MAKE *AND* GCC: you must set - the AUTOMAKE_FLAGS environment variable to "--include-deps" - before running autogen.sh. For example: - - csh% setenv AUTOMAKE_FLAGS --include-deps - csh% ./autogen.sh - or - sh% AUTOMAKE_FLAGS=--include-deps ./autogen.sh - -3. Run configure. There are several options available; see - "./configure --help" for more information. - -4. Run "make" to build the source. - -In general, steps 2 and 3 need to be re-run every time any of the -following files are modified (either manually or by a svn update): - - configure.in - m4/* - -Running "make clean" after running steps 2 and 3 is generally also -advisable before running step 4. It isn't *always* necessary, but -unless you understand the workings of autoconf/automake, it's safest -to just do it. diff --git a/lib/libshout-idjc/Makefile.am b/lib/libshout-idjc/Makefile.am index 3974a2b801..edc9f6849c 100644 --- a/lib/libshout-idjc/Makefile.am +++ b/lib/libshout-idjc/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = include src examples doc win32 EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \ m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ - m4/xiph_types.m4 libshout.ckport + m4/xiph_types.m4 libshout-idjc.ckport docdir = $(datadir)/doc/$(PACKAGE) doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c @@ -16,11 +16,11 @@ m4datadir = $(datadir)/aclocal m4data_DATA = m4/shout.m4 ckportdir = $(libdir)/ckport/db -ckport_DATA = libshout.ckport +ckport_DATA = libshout-idjc.ckport if HAVE_PKGCONFIG pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = shout.pc + pkgconfig_DATA = shout-idjc.pc endif debug: diff --git a/lib/libshout-idjc/Makefile.in b/lib/libshout-idjc/Makefile.in new file mode 100644 index 0000000000..06f70f3de2 --- /dev/null +++ b/lib/libshout-idjc/Makefile.in @@ -0,0 +1,997 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \ + $(top_srcdir)/m4/speex.m4 $(top_srcdir)/m4/theora.m4 \ + $(top_srcdir)/m4/vorbis.m4 $(top_srcdir)/m4/xiph_compiler.m4 \ + $(top_srcdir)/m4/xiph_net.m4 $(top_srcdir)/m4/xiph_openssl.m4 \ + $(top_srcdir)/m4/xiph_types.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = shout-idjc.pc +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ |