Packman Build Service PMBS

faac.changes Changed

faac.spec Changed

@@ -1,6 +1,7 @@
 #
 # spec file for package faac
 #
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 Marguerite Su <marguerite@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -12,94 +13,69 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.links2linux.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
 %define major     0
 %define lib       libfaac
 %define libname   %{lib}%{major}
-
 Name:           faac
 Version:        1.28
 Release:        0
-# Original Code was free to use but restricted. Modifications are LGPL-2.1+
-License:        SuSE-Freeware and LGPL-2.1+
 Summary:        Frontend for encoding MPEG2/4 AAC
-Url:            http://www.audiocoding.com/
+# Original Code was free to use but restricted. Modifications are LGPL-2.1+
+License:        SUSE-Freeware and LGPL-2.1+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Url:            http://www.audiocoding.com/
 Source0:        faac-%{version}.tar.bz2
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org - port to use external mp4v2 2.0
-Patch:		faac-1.28-external-mp4v2-2.0.patch
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix strict-aliasing-punning warning.
-Patch1:		faac-1.28-strict-aliasing-punning.patch
-# PATCH-FIX-OPENSUSE crrodriguez@opensuse.org - hide library-private symbols
-Patch2:     faac-visibility.patch
+Patch0:         faac-1.28-strict-aliasing-punning.patch
 BuildRequires:  gcc-c++
-BuildRequires:  libmp4v2-devel
-# Here only because of the configure mp4v2 detection
-BuildRequires:  libstdc++-devel
-BuildRequires:  libtool
 Requires:       %{libname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Summary(de):    Frontend zum Encodieren von MPEG2/4 AAC
 
 %description
 FAAC is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC encoder, completely
 written from scratch.
 
-%description -l de
-FAAC ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Encoder.
-
 %package -n %{libname}
 Summary:        Shared library part of faac
 Group:          System/Libraries
 Provides:       %{lib} = %{version}
-Obsoletes:	%{lib} < %{version}
-Summary(de):    Bibliotheken zu faac
+Obsoletes:      %{lib} < %{version}
 
 %description -n %{libname}
 FAAC is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC encoder, completely
 written from scratch.
 Shared library part of faac
 
-%description -n %{libname} -l de
-FAAC ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Encoder.
-Bibliotheken zu faac
-
 %package -n %{lib}-devel
 Summary:        Header files and static library for the faac library
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
 Provides:       %{libname}-devel = %{version}
 Provides:       %{name}-devel = %{version}
-Obsoletes:	%{libname}-devel < %{version}
-Obsoletes:	%{name}-devel < %{version}
-Summary(de):    Header Dateien und statische Bibliotheken für die faac Bibliothek
+Obsoletes:      %{libname}-devel < %{version}
+Obsoletes:      %{name}-devel < %{version}
 
 %description -n %{lib}-devel
 FAAC is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC encoder, completely
 written from scratch.
 Header files and static library for the faac library
 
-%description -n %{lib}-devel -l de
-FAAC ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Encoder.
-Header Dateien und statische Bibliotheken für die faac Bibliothek
-
 %prep
-%setup -qn faac-%{version}
-%patch -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n faac-%{version}
+%patch0 -p1
+
 %build
-./bootstrap
-%configure --with-mp4v2 --enable-shared --disable-static
+%configure --without-mp4v2 --enable-shared --disable-static
 make %{?_smp_mflags}
 
 %install
 %make_install
-rm -f %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig

faac-1.28-external-mp4v2-2.0.patch Deleted

@@ -1,186 +0,0 @@
-Index: faac-1.28/configure.in
-===================================================================
---- faac-1.28.orig/configure.in
-+++ faac-1.28/configure.in
-@@ -28,14 +28,23 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
- AC_CHECK_LIB(gnugetopt, getopt_long)
- 
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
- 
--AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
--               AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-+AC_CHECK_DECLS([MP4Create],
-+               AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes,
-                             external_mp4v2=no, -lstdc++),
--               external_mp4v2=no, [#include <mp4.h>])
-+               external_mp4v2=no, [
-+#if defined(__ALTIVEC__)
-+#undef bool
-+#endif
-+#include <mp4v2/mp4v2.h>
-+])			
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  MY_DEFINE(HAVE_LIBMP4V2)
-+  AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
-+  AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>])
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
-Index: faac-1.28/frontend/Makefile.am
-===================================================================
---- faac-1.28.orig/frontend/Makefile.am
-+++ faac-1.28/frontend/Makefile.am
-@@ -8,5 +8,9 @@ INCLUDES = -I$(top_srcdir)/include -I$(t
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include 
-+if WITH_EXTERNAL_MP4V2
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
-+else
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif
-Index: faac-1.28/frontend/main.c
-===================================================================
---- faac-1.28.orig/frontend/main.c
-+++ faac-1.28/frontend/main.c
-@@ -30,7 +30,10 @@
- #endif
- 
- #ifdef HAVE_LIBMP4V2
--# include <mp4.h>
-+#if defined(__ALTIVEC__)
-+#undef bool
-+#endif
-+# include <mp4v2/mp4v2.h>
- #endif
- 
- #define DEFAULT_TNS     0
-@@ -870,8 +873,12 @@ int main(int argc, char *argv[])
-     if (!faacEncSetConfiguration(hEncoder, myFormat)) {
-         fprintf(stderr, "Unsupported output format!\n");
- #ifdef HAVE_LIBMP4V2
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+        if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
-+#else
-         if (container == MP4_CONTAINER) MP4Close(MP4hFile);
- #endif
-+#endif
-         return 1;
-     }
- 
-@@ -882,12 +889,10 @@ int main(int argc, char *argv[])
-         unsigned long ASCLength = 0;
-     char *version_string;
- 
--#ifdef MP4_CREATE_EXTENSIBLE_FORMAT
--    /* hack to compile against libmp4v2 >= 1.0RC3
--     * why is there no version identifier in mp4.h? */
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */
-         MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0);
- #else
--    MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0);
-+    MP4hFile = MP4Create(aacFileName, 0);
- #endif
-         if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) {
-             fprintf(stderr, "Couldn't create output file %s\n", aacFileName);
-@@ -902,12 +907,22 @@ int main(int argc, char *argv[])
-     free(ASC);
- 
-     /* set metadata */
-+#if HAVE_DECL_MP4TAGSALLOC
-+    const MP4Tags* tags;
-+    tags = MP4TagsAlloc();
-+    MP4TagsFetch( tags, MP4hFile );
-+#endif
-     version_string = malloc(strlen(faac_id_string) + 6);
-     strcpy(version_string, "FAAC ");
-     strcpy(version_string + 5, faac_id_string);
-+#if !HAVE_DECL_MP4TAGSALLOC
-     MP4SetMetadataTool(MP4hFile, version_string);
-+#else
-+    MP4TagsSetEncodingTool(tags, version_string);
-+#endif
-     free(version_string);
- 
-+#if !HAVE_DECL_MP4TAGSALLOC
-     if (artist) MP4SetMetadataArtist(MP4hFile, artist);
-     if (writer) MP4SetMetadataWriter(MP4hFile, writer);
-     if (title) MP4SetMetadataName(MP4hFile, title);
-@@ -920,8 +935,40 @@ int main(int argc, char *argv[])
-     if (comment) MP4SetMetadataComment(MP4hFile, comment);
-         if (artSize) {
-         MP4SetMetadataCoverArt(MP4hFile, art, artSize);
-+#else
-+    if (artist) MP4TagsSetArtist(tags, artist);
-+    if (writer) MP4TagsSetComposer(tags, writer);
-+    if (title) MP4TagsSetName(tags, title);
-+    if (album) MP4TagsSetAlbum(tags, album);
-+    if (trackno > 0) {
-+        MP4TagTrack tt;
-+        tt.index = trackno;
-+        tt.total = ntracks;
-+        MP4TagsSetTrack(tags, &tt);
-+    }
-+    if (discno > 0) {
-+        MP4TagDisk td;
-+        td.index = discno;
-+        td.total = ndiscs;
-+        MP4TagsSetDisk(tags, &td);
-+    }
-+    if (compilation) MP4TagsSetCompilation(tags, &compilation);
-+    if (year) MP4TagsSetReleaseDate(tags, year);
-+    if (genre) MP4TagsSetGenre(tags, genre);
-+    if (comment) MP4TagsSetComments(tags, comment);
-+    if (artSize) {
-+        MP4TagArtwork mp4art;
-+        mp4art.data = art;
-+        mp4art.size = artSize;
-+        mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
-+        MP4TagsAddArtwork( tags, &mp4art );
-+#endif
-         free(art);
-     }
-+#if HAVE_DECL_MP4TAGSALLOC
-+    MP4TagsStore( tags, MP4hFile );
-+    MP4TagsFree( tags );
-+#endif
-     }
-     else
-     {
-@@ -1138,11 +1185,19 @@ int main(int argc, char *argv[])
-         /* clean up */
-         if (container == MP4_CONTAINER)
-         {
-+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
-+            MP4Close(MP4hFile, 0);
-+#else
-             MP4Close(MP4hFile);
-+#endif
-             if (optimizeFlag == 1)
-             {
-                 fprintf(stderr, "\n\nMP4 format optimization... ");
--                MP4Optimize(aacFileName, NULL, 0);
-+#ifdef MP4_DETAILS_ERROR /* r453 fix */ 
-+               MP4Optimize(aacFileName, NULL, 0);
-+#else
-+	       MP4Optimize(aacFileName, NULL);
-+#endif
-                 fprintf(stderr, "Done!");
-             }
-         } else
-Index: faac-1.28/common/mp4v2/mpeg4ip.h
-===================================================================
---- faac-1.28.orig/common/mp4v2/mpeg4ip.h
-+++ faac-1.28/common/mp4v2/mpeg4ip.h
-@@ -123,7 +123,6 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--char *strcasestr(const char *haystack, const char *needle);
- #ifdef __cplusplus
- }
- #endif

faac-visibility.patch Deleted

Changes of Revision 8