From 78af5389063d4ee064016834a16604ee732a47b5 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 1 Mar 2026 14:40:12 +0300 Subject: Purge remnants of libmp4 support The support for libmp4 was already removed in 460320e5. This commit purges remnants left behind. Most notably the checks in ConfigureChecks.cmake and dependencies in INSTALL. Signed-off-by: Alexander Golubev --- ConfigureChecks.cmake | 33 ----------------- INSTALL | 5 --- amarok/configure.in.in | 79 ----------------------------------------- amarok/src/metadata/Makefile.am | 8 ----- config.h.cmake | 3 -- config.h.in | 12 ------- 6 files changed, 140 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f0b59754..6024d961 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -259,39 +259,6 @@ if( WITH_KONQSIDEBAR ) endif( ) -if( WITH_MP4V2 ) -##### check for mp4v2 - -check_include_file( "mp4v2/mp4v2.h" MP4V2_H_FOUND ) -if( MP4V2_H_FOUND ) - set( HAVE_MP4V2_H 1) - - find_path( MP4V2_INCLUDE_DIR "mp4v2/mp4v2.h" ) - set( MP4V2_INCLUDE_DIRS "${MP4V2_INCLUDE_DIR}" ) - - find_library( MP4V2_LIBRARY mp4v2 ) - set( MP4V2_LIBRARIES "${MP4V2_LIBRARY}" ) -endif() - -check_include_file( "mp4.h" MP4_H_FOUND ) -if( MP4_H_FOUND ) - set( HAVE_MP4_H 1) - - find_path( MP4_INCLUDE_DIR "mp4.h" ) - set( MP4V2_INCLUDE_DIRS "${MP4_INCLUDE_DIR}" ) - - find_library( MP4_LIBRARY mp4 ) - set( MP4V2_LIBRARIES "${MP4_LIBRARY}" ) -endif() - -if( HAVE_MP4V2_H OR HAVE_MP4_H ) - set( HAVE_MP4V2 1 ) - else() - tde_message_fatal( "MP4V2 support was requested but was not found on your system" ) -endif() -endif( WITH_MP4V2 ) - - if( WITH_MYSQL ) #### check for MySql or Mariadb diff --git a/INSTALL b/INSTALL index d4ccdd90..cc073614 100644 --- a/INSTALL +++ b/INSTALL @@ -76,11 +76,6 @@ Optional (iRiver iFP support) http://ifp-driver.sourceforge.net/libifp/ - * libmp4v2 (mpeg4ip 1.5 is recommended, faad2 is less reliable) - (MP4/AAC tag reading & writing) - http://www.sf.net/projects/mpeg4ip - http://www.audiocoding.com - * libnjb 2.2.4 (older versions may work) (NJB mediadevice (Creative Nomad/Zen family, Dell DJ devices) http://www.sf.net/projects/libnjb diff --git a/amarok/configure.in.in b/amarok/configure.in.in index fc258b7c..07e2b7e7 100644 --- a/amarok/configure.in.in +++ b/amarok/configure.in.in @@ -998,85 +998,6 @@ AC_CHECK_FUNCS(statvfs) -############################################################################### -# BEGIN MP4V2 CHECK -############################################################################### -# m4a/aac tag reading and writing needs libmp4v2 from faad2 or better mpeg4ip - -AC_ARG_WITH(mp4v2, - AC_HELP_STRING([--with-mp4v2],[build Amarok with M4A/AAC tag support from mp4v2/faad2]), - [have_mp4v2=$withval], - [have_mp4v2=no] -) - -AC_ARG_WITH(mp4v2-dir, - AC_HELP_STRING([--with-mp4v2-dir],[path to mp4v2 [default=/usr]]), - [mp4v2_dir="$withval"], - [mp4v2_dir=/usr] -) - -if test "$have_mp4v2" != "no"; then - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - ac_cxxflags_save=$CXXFLAGS - CXXFLAGS="$CXXFLAGS -I$mp4v2_dir/include" - ac_ldflags_save=$LDFLAGS - LDFLAGS="$LDFLAGS -L$mp4v2_dir/lib" - - # not even everyone using faad2 has - if ! test -f config.h; then - echo "#include \"confdefs.h\"" > config.h - fi - ac_cppflags_save=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I." - AC_CHECK_HEADERS(systems.h) - AC_CHECK_HEADERS([mp4v2/mp4v2.h], [have_mp4v2_h=yes], [], - [#ifdef HAVE_SYSTEMS_H - # include - #endif - ]) - if test "$have_mp4v2_h" = "yes"; then - AC_DEFINE(HAVE_MP4V2_H, 1, [have mp4v2 h]) - else - AC_CHECK_HEADERS([mp4.h], [have_mp4_h=yes], [], - [#ifdef HAVE_SYSTEMS_H - # include - #endif - ]) - if test "$have_mp4_h" = "yes"; then - AC_DEFINE(HAVE_MP4_H, 1, [have mp4 h]) - fi - fi - - if test "$have_mp4v2_h" = "yes" -o "$have_mp4_h" = "yes"; then - AC_CHECK_LIB( mp4v2, MP4Read, have_mp4v2=yes, have_mp4v2=no ) - fi - - if test "$have_mp4v2" = "yes"; then - AC_DEFINE(HAVE_MP4V2, 1, [have mp4v2]) - MP4V2_INCLUDES="-I$mp4v2_dir/include" - MP4V2_LIBS="-L$mp4v2_dir/lib -lmp4v2" - else - have_mp4v2=no - fi - - CPPFLAGS=$ac_cppflags_save - CXXFLAGS=$ac_cxxflags_save - LDFLAGS=$ac_ldflags_save - AC_LANG_RESTORE -fi - -AC_SUBST(MP4V2_INCLUDES) -AC_SUBST(MP4V2_LIBS) - -AM_CONDITIONAL(with_mp4v2, [test x$have_mp4v2 != xno ]) - -############################################################################### -# END MP4V2 CHECK -############################################################################### - - - ############################################################################### # BEGIN DAAP KDE 3.4 CHECK ############################################################################### diff --git a/amarok/src/metadata/Makefile.am b/amarok/src/metadata/Makefile.am index 617bb9d8..31374b25 100644 --- a/amarok/src/metadata/Makefile.am +++ b/amarok/src/metadata/Makefile.am @@ -1,11 +1,3 @@ -if with_mp4v2 -MP4_SUBDIR = mp4 -MP4_LDADD = mp4/libtagmp4.la -else -MP4_SUBDIR = m4a -MP4_LDADD = m4a/libtagm4a.la -endif - if !TAGLIB_15_FOUND TAGLIB14_SUBDIRS = speex wavpack trueaudio TAGLIB14_LDADD = speex/libtagspeex.la trueaudio/libtagtrueaudio.la wavpack/libtagwavpack.la diff --git a/config.h.cmake b/config.h.cmake index 26f9d263..ac54d385 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -20,9 +20,6 @@ #cmakedefine HAVE_ITDB_MEDIATYPE 1 #cmakedefine HAVE_LIBGPOD_060 1 -#cmakedefine HAVE_MP4V2 1 -#cmakedefine HAVE_MP4V2_H 1 -#cmakedefine HAVE_MP4_H 1 #cmakedefine HAVE_TUNEPIMP 1 #cmakedefine TAGLIB_15 1 diff --git a/config.h.in b/config.h.in index 22ad23f0..b578c909 100644 --- a/config.h.in +++ b/config.h.in @@ -103,18 +103,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* have mp4v2 */ -#undef HAVE_MP4V2 - -/* have mp4v2 h */ -#undef HAVE_MP4V2_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MP4V2_MP4V2_H - -/* have mp4 h */ -#undef HAVE_MP4_H - /* have NMM */ #undef HAVE_NMM -- cgit v1.2.3