Request 6125 (accepted)

Overview

Request 6125 (accepted)

abf9b320cac89aaee3beafa12d2bb60253d7112e

Created by olh 2 months ago
In state accepted

Submit faad2

Submit package Staging / faad2 to package Essentials / faad2

faad2.changes Changed

faad2.spec Changed

@@ -19,166 +19,86 @@
 #
 
 
-%define major      2
-%define lib        libfaad
-%define libname    %{lib}%{major}
-%define _version   2_10_0
-%bcond_with    xmms
-# mpeg4ip is built without gmp4player, it makes no sense to build the plugin
-%bcond_with mpeg4ip
+%define so_version  2
+%define so_name     libfaad%so_version
+%define so_name_drm libfaad_drm%so_version
 Name:           faad2
-Version:        2.10.1
+Version:        0
 Release:        0
-Summary:        C library and frontend for decoding MPEG2/4 AAC
-Summary(de):    C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC
+Summary:        Freeware Advanced Audio (AAC) Decoder including SBR decoding
 License:        GPL-2.0-or-later
-Group:          Productivity/Multimedia/Video/Editors and Convertors
 URL:            https://github.com/knik0/faad2
-Source0:        %{url}/archive/%{_version}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-visibility.patch
-Patch1:         faad2-PACKAGE_VERSION.patch
-BuildRequires:  libtool
+Source0:        %name-%version.tar
+BuildRequires:  cmake >= 3.15
 BuildRequires:  pkgconfig
-Requires:       %{libname} = %{version}
-%if %{with mpeg4ip}
-BuildRequires:  SDL-devel
-BuildRequires:  libmp4v2-devel
-%endif
-%if %{with xmms}
-BuildRequires:  id3lib-devel
-BuildRequires:  xmms2-devel
-%endif
-#Obsoletes:      faad2-drm
-#Provides:       faad2-drm
+Requires:       %so_name = %version-%release
 
 %description
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch. FAAD 2 is licensed under the GPL.
+FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+FAAD2 includes code for SBR (HE AAC) decoding.
 
-%description -l de
-FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
-
-%package -n %{libname}
+%package -n %so_name
 Summary:        Shared library part of faad2
-Summary(de):    Bibliotheken zu faad2
-Group:          System/Libraries
-Provides:       %{lib} = %{version}
-Provides:       lib%{name}_2 = %{version}
-Obsoletes:      lib%{name}_2 < %{version}
-Provides:       libfaad-2 = %{version}
-Obsoletes:      libfaad-2 < %{version}
-
-%description -n %{libname}
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch. FAAD 2 is licensed under the GPL.
-The shared library part of faad2
-
-%description -n %{libname} -l de
-FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
-Die Bibliotheken zu faad2
-
-%package -n %{lib}_drm%{major}
+
+%description -n %so_name
+FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+FAAD2 includes code for SBR (HE AAC) decoding.
+
+%package -n %so_name_drm
 Summary:        DRM shared library part of faad2
-Group:          System/Libraries
-Provides:       %{lib} = %{version}
 
-%description -n %{lib}_drm%{major}
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch. FAAD 2 is licensed under the GPL.
+%description -n %so_name_drm
+FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+FAAD2 includes code for SBR (HE AAC) decoding.
 The shared library part of faad2-drm
 
-%package -n %{lib}-devel
+%package devel
 Summary:        Development files of the FAAD 2 AAC decoder
-Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders
-Group:          Development/Libraries/C and C++
-Requires:       %{libname} = %{version}
-Requires:       %{lib}_drm%{major} = %{version}
-Requires:       %{name} = %{version}
-Obsoletes:      lib%{name}-devel < %{version}
-Provides:       lib%{name}-devel = %{version}
-Obsoletes:      %{name}-devel < %{version}
-Provides:       %{name}-devel = %{version}
-Obsoletes:      %{name}-drm-devel < %{version}
-Provides:       %{name}-drm-devel = %{version}
-
-%description -n %{lib}-devel
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch. FAAD 2 is licensed under the GPL.
+Requires:       %so_name = %version-%release
+Requires:       %so_name_drm = %version-%release
+Obsoletes:      libfaad2-devel < %version-%release
+Provides:       libfaad2-devel = %version-%release
+Obsoletes:      libfaad-devel < %version-%release
+Provides:       libfaad-devel = %version-%release
+
+%description devel
+FAAD2 is a HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+FAAD2 includes code for SBR (HE AAC) decoding.
 Header files and development documentation for libfaad.
 
-%description -n %{lib}-devel -l de
-FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
-Header-Dateien und Entwicklerdokumtation zur libfaad.
-
-%if %{with xmms}
-%package -n xmms-%{name}
-Summary:        Xmms faad2 input plugin
-Summary(de):    Xmms faad2 Eingabeplugin
-Group:          Productivity/Multimedia/Sound/Players
-Requires:       %{libname} = %{version}
-Requires:       xmms >= 1.2.8
-Obsoletes:      %{name}-xmms-plugin < %{version}
-Provides:       %{name}-xmms-plugin = %{version}
-
-%description -n xmms-%{name}
-The plugin read aac files with and without ID3tag(version 2.x), AAC files
-are MPEG2 or MPEG4 files that could be found in MPEG4 audio files (.mp4).
-
-%description -l de -n xmms-%{name}
-Das plugin für xmms liest AAC Dateien mit und ohne ID3-Tags (version 2.x).
-AAC Dateien sind MPEG2 oder MPEG4 Dateien, sie finden Verwendung in MPEG4
-Audodateien (.mp4).
-%endif
-
 %prep
-%autosetup -p1 -n %{name}-%{_version}
-
-sed -i 's/__PACKAGE_VERSION__/%{version}/' include/neaacdec.h
+%autosetup -p1
 
 %build
-autoreconf -ifv
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-%configure \
-%if %{with xmms}
-	--with-xmms \
-%endif
-	--with-pic \
-	--enable-shared \
-	--disable-static
-%make_build
+CFLAGS='%optflags -DBUILD_DATE=\"\"'
+%cmake
+%cmake_build
 
 %install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
+%cmake_install
 
-%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
-%post -n %{lib}_drm%{major} -p /sbin/ldconfig
-%postun -n %{lib}_drm%{major} -p /sbin/ldconfig
+%ldconfig_scriptlets -n %so_name
+%ldconfig_scriptlets -n %so_name_drm
 
 %files
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc ChangeLog
 %license COPYING
-%{_bindir}/faad
-%{_mandir}/man1/faad.1%{?ext_man}
-
-%files -n %{libname}
-%{_libdir}/libfaad.so.%{major}*
-
-%files -n %{lib}_drm%{major}
-%{_libdir}/libfaad_drm.so.%{major}*
-
-%files -n %{lib}-devel
-%{_includedir}/faad.h
-%{_includedir}/neaacdec.h
-%{_libdir}/libfaad.so
-%{_libdir}/libfaad_drm.so
-%{_libdir}/pkgconfig/%{name}.pc
-
-%if %{with xmms}
-%files -n xmms-%{name}
-%doc plugins/xmms/README
-%{_libdir}/xmms/Input/libmp4*
-%endif
+%_bindir/faad
+%_mandir/man1/faad.1%{?ext_man}
+
+%files -n %so_name
+%_libdir/libfaad.so.%so_version
+%_libdir/libfaad.so.%so_version.*
+
+%files -n %so_name_drm
+%_libdir/libfaad_drm.so.%so_version
+%_libdir/libfaad_drm.so.%so_version.*
+
+%files devel
+%_includedir/faad.h
+%_includedir/neaacdec.h
+%_libdir/libfaad.so
+%_libdir/libfaad_drm.so
+%_libdir/pkgconfig/%name.pc
 
 %changelog

faad2-PACKAGE_VERSION.patch Deleted

@@ -1,29 +0,0 @@
-Index: faad2-2_10_0/frontend/main.c
-===================================================================
---- faad2-2_10_0.orig/frontend/main.c
-+++ faad2-2_10_0/frontend/main.c
-@@ -1218,11 +1218,6 @@ static int faad_main(int argc, char *arg
-     NeAACDecGetVersion(&faad_id_string, &faad_copyright_string);
- 
-     faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", faad_id_string);
--#ifndef BUILD_DATE
--#define BUILD_DATE __DATE__
--#endif
--    faad_fprintf(stderr, " Build: %s\n", BUILD_DATE);
--#undef BUILD_DATE
-     faad_fprintf(stderr, "%s", faad_copyright_string);
-     if (cap & FIXED_POINT_CAP)
-         faad_fprintf(stderr, " Fixed point version\n");
-Index: faad2-2_10_0/include/neaacdec.h
-===================================================================
---- faad2-2_10_0.orig/include/neaacdec.h
-+++ faad2-2_10_0/include/neaacdec.h
-@@ -69,7 +69,7 @@ extern "C" {
-   #define NEAACDECAPI
- #endif
- 
--#define FAAD2_VERSION "unknown"
-+#define FAAD2_VERSION "__PACKAGE_VERSION__"
- 
- /* object types for AAC */
- #define MAIN       1

faad2-visibility.patch Deleted

@@ -1,81 +0,0 @@
-diff -Nur faad2-2_9_1/configure.ac faad2-2_9_1-new/configure.ac
---- faad2-2_9_1/configure.ac	2019-11-04 18:22:03.000000000 +0800
-+++ faad2-2_9_1-new/configure.ac	2020-02-13 16:49:34.294512000 +0800
-@@ -16,7 +16,9 @@
- AC_SUBST(LIBTOOL_DEPS)
- 
- dnl Checks for programs.
--AC_PROG_CC
-+AC_PROG_CC_STDC
-+AC_USE_SYSTEM_EXTENSIONS
-+AC_SYS_LARGEFILE
- AM_PROG_CC_C_O
- AC_PROG_CPP
- dnl disable for mpeg4ip plugin
-@@ -75,46 +77,7 @@
- fi
- )
- 
--dnl @synopsis AC_C99_FUNC_LRINTF
--dnl
--dnl Check whether C99's lrintf function is available.
--dnl @version 1.3        Feb 12 2002
--dnl @author Erik de Castro Lopo <erikd AT mega-nerd DOT com>
--dnl
--dnl Permission to use, copy, modify, distribute, and sell this file for any
--dnl purpose is hereby granted without fee, provided that the above copyright
--dnl and this permission notice appear in all copies.  No representations are
--dnl made about the suitability of this software for any purpose.  It is
--dnl provided "as is" without express or implied warranty.
--dnl
--AC_DEFUN(AC_C99_FUNC_LRINTF,
--AC_CACHE_CHECK(for lrintf,
--  ac_cv_c99_lrintf,
--
--lrintf_save_CFLAGS=$CFLAGS
--lrintf_save_LIBS=$LIBS
--CFLAGS="-O"
--LIBS="-lm"
--AC_TRY_LINK(
--#define         _ISOC9X_SOURCE  1
--#define         _ISOC99_SOURCE  1
--#define         __USE_ISOC99    1
--#define         __USE_ISOC9X    1
--
--#include <math.h>
--, if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no)
--
--CFLAGS=$lrintf_save_CFLAGS
--LIBS=$lrintf_save_LIBS
--
--)
--
--if test "$ac_cv_c99_lrintf" = yes; then
--  AC_DEFINE(HAVE_LRINTF, 1,
--            Define if you have C99's lrintf function.)
--fi
--)# AC_C99_FUNC_LRINTF
--AC_C99_FUNC_LRINTF
-+AC_SEARCH_LIBS(lrintf, m, AC_DEFINE(HAVE_LRINTF, 1, Define if you have C99 lrintf function))
- 
- MY_CHECK_TYPEDEF_FROM_INCLUDE(float32_t temp,
-         #include <sys/types.h>,
-diff -Nur faad2-2_9_1/include/neaacdec.h faad2-2_9_1-new/include/neaacdec.h
---- faad2-2_9_1/include/neaacdec.h	2019-11-04 18:22:03.000000000 +0800
-+++ faad2-2_9_1-new/include/neaacdec.h	2020-02-13 16:50:25.338189000 +0800
-@@ -31,6 +31,8 @@
- #ifndef __NEAACDEC_H__
- #define __NEAACDEC_H__
- 
-+#pragma GCC visibility push(default)
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-@@ -257,4 +259,6 @@
- }
- #endif /* __cplusplus */
- 
-+#pragma GCC visibility pop
-+
- #endif

_service Added

faad2-2.10.1.tar.gz Deleted

Build Results
RPM Lint

Refresh

Comments for request 6125 0

Request History

olh created request 2 months ago

abf9b320cac89aaee3beafa12d2bb60253d7112e

olh accepted request 2 months ago