Projects
Staging
faad2
Sign Up
Log In
Username
Password
Problem getting expanded diff: bad link: could not apply patch 'project.diff'
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 5
View file
project.diff
Deleted
@@ -1,194 +0,0 @@ ---- faad2-PACKAGE_VERSION.patch.orig -+++ faad2-PACKAGE_VERSION.patch -@@ -1,21 +1,12 @@ ----- a/frontend/main.c --+++ b/frontend/main.c --@@ -1194,7 +1194,6 @@ int main(int argc, char *argv[]) -- NeAACDecGetVersion(&faad_id_string, &faad_copyright_string); -- -- faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", faad_id_string); --- faad_fprintf(stderr, " Build: %s\n", __DATE__); -- faad_fprintf(stderr, "%s", faad_copyright_string); -- if (cap & FIXED_POINT_CAP) -- faad_fprintf(stderr, " Fixed point version\n"); ----- a/include/neaacdec.h --+++ b/include/neaacdec.h --@@ -67,7 +67,7 @@ extern "C" { -+diff -Nur faad2-2_9_1/include/neaacdec.h faad2-2_9_1-new/include/neaacdec.h -+--- faad2-2_9_1/include/neaacdec.h 2020-02-13 18:22:42.051817000 +0800 -++++ faad2-2_9_1-new/include/neaacdec.h 2020-02-13 19:18:47.643268316 +0800 -+@@ -69,7 +69,7 @@ - #define NEAACDECAPI - #endif - - -#define FAAD2_VERSION "unknown" --+#define FAAD2_VERSION "2.8.6" -++#define FAAD2_VERSION "2.9.1" - - /* object types for AAC */ - #define MAIN 1 ---- faad2-visibility.patch.orig -+++ faad2-visibility.patch -@@ -1,6 +1,6 @@ --diff -Nur faad2-2.8.5/configure.ac faad2-2.8.5-new/configure.ac ----- faad2-2.8.5/configure.ac 2017-09-30 15:42:38.000000000 +0800 --+++ faad2-2.8.5-new/configure.ac 2017-10-09 16:21:20.093673596 +0800 -+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) - -@@ -12,7 +12,7 @@ diff -Nur faad2-2.8.5/configure.ac faad2 - AM_PROG_CC_C_O - AC_PROG_CPP - dnl disable for mpeg4ip plugin --@@ -75,43 +77,7 @@ -+@@ -75,46 +77,7 @@ - fi - ]) - -@@ -33,7 +33,9 @@ diff -Nur faad2-2.8.5/configure.ac faad2 - - ac_cv_c99_lrintf, - -[ - -lrintf_save_CFLAGS=$CFLAGS ---CFLAGS="-O -lm" -+-lrintf_save_LIBS=$LIBS -+-CFLAGS="-O" -+-LIBS="-lm" - -AC_TRY_LINK([ - -#define _ISOC9X_SOURCE 1 - -#define _ISOC99_SOURCE 1 -@@ -44,6 +46,7 @@ diff -Nur faad2-2.8.5/configure.ac faad2 - -], 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 - - - -]) - - -@@ -57,9 +60,9 @@ diff -Nur faad2-2.8.5/configure.ac faad2 - - MY_CHECK_TYPEDEF_FROM_INCLUDE([float32_t temp], - [#include <sys/types.h>, --diff -Nur faad2-2.8.5/include/neaacdec.h faad2-2.8.5-new/include/neaacdec.h ----- faad2-2.8.5/include/neaacdec.h 2017-07-20 18:12:08.000000000 +0800 --+++ faad2-2.8.5-new/include/neaacdec.h 2017-10-09 16:18:42.381314655 +0800 -+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__ -@@ -69,10 +72,10 @@ diff -Nur faad2-2.8.5/include/neaacdec.h - #ifdef __cplusplus - extern "C" { - #endif /* __cplusplus */ --@@ -262,5 +264,6 @@ -- #ifdef __cplusplus -+@@ -257,4 +259,6 @@ - } - #endif /* __cplusplus */ --+#pragma GCC visibility pop - -++#pragma GCC visibility pop -++ - #endif ---- faad2.changes.orig -+++ faad2.changes -@@ -1,4 +1,38 @@ - ------------------------------------------------------------------- -+Thu Feb 13 08:58:00 UTC 2020 - Hillwood Yang <hillwood@opensuse.org> -+ -+- Update version to 2.9.1 -+ * Include stdio.h in libfaad/ps_dec.c for stderr (Michael Fink) -+ * Fix Tille -> Title typo in frontend/mp4read.c (Alexander Thomas) -+ * Build system fixes and code clean-up -+ * Fix compiler warnings and code indentation -+ * Fix compilation with GCC <= 4.7.3 -+ * MSVC solution file clean-up -+ * Fix compilation with GCC 4.7.4 -+ * Fix compilation with MinGW -+ * MSVC 2017 project file update -+ * Fix crash with unsupported MP4 files (NULL pointer dereference, -+ * division by zero) -+ * CVE-2019-6956: ps_dec: sanitize iid_index before mixing -+ * CVE-2018-20196: sbr_fbt: sanitize sbr->M (should not exceed MAX_M) -+ * CVE-2018-20199, CVE-2018-20360: specrec: better handle unexpected -+ * parametric stereo (PS) -+ * CVE-2018-20362, CVE-2018-19504, CVE-2018-20195, CVE-2018-20198, -+ * CVE-2018-20358: syntax.c: check for syntax element inconsistencies -+ * CVE-2018-20194, CVE-2018-19503, CVE-2018-20197, CVE-2018-20357, -+ * CVE-2018-20359, CVE-2018-20361: sbr_hfadj: sanitize frequency band -+ * borders -+ * CVE-2019-15296, CVE-2018-19502: Fix a couple buffer overflows -+ * Prevent crash on SCE followed by CPE -+ * Fix linking with GCC 9 and "-Wl,--as-needed" -+ * Enable the frontend to be built reproducibly -+- Drop patches: Fix-a-couple-buffer-overflows.patch, -+ syntax.c-check-for-syntax-element-inconsistencies.patch -+ sbr_hfadj-sanitize-frequency-band-borders.patch -+ merged by upstream. -+- Drop faad2-pic-fix.patch, all files are non-existent which need to be patched. -+ -+------------------------------------------------------------------- - Thu Aug 29 15:40:36 UTC 2019 - Bjørn Lie <zaitor@opensuse.org> - - - Add patches from debian fixing CVE-2018-20194 and CVE-2018-20362 ---- faad2.spec.orig -+++ faad2.spec -@@ -6,26 +6,23 @@ - %define major 2 - %define lib libfaad - %define libname %{lib}%{major} -+%define _version 2_9_1 - - %bcond_with xmms - # mpeg4ip is built without gmp4player, it makes no sense to build the plugin - %bcond_with mpeg4ip - - Name: faad2 --Version: 2.8.8 -+Version: 2.9.1 - Release: 1 - License: GPL-2.0+ - Summary: C library and frontend for decoding MPEG2/4 AAC - Summary(de): C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC - Url: http://www.audiocoding.com/ - Group: Productivity/Multimedia/Video/Editors and Convertors --Source0: http://downloads.sourceforge.net/project/faac/%{name}-src/%{name}-%{version}/%{name}-%{version}.tar.gz -+Source0: https://github.com/knik0/faad2/archive/%{_version}/%{name}-%{version}.tar.gz - Patch0: %{name}-visibility.patch - Patch1: faad2-PACKAGE_VERSION.patch --Patch2: faad2-pic-fix.patch --Patch3: Fix-a-couple-buffer-overflows.patch --Patch4: syntax.c-check-for-syntax-element-inconsistencies.patch --Patch5: sbr_hfadj-sanitize-frequency-band-borders.patch - Requires: %{libname} = %{version} - BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if %{with mpeg4ip} -@@ -120,13 +117,9 @@ Audodateien (.mp4). - %endif - - %prep --%setup -q -+%setup -q -n %{name}-%{_version} - %patch0 -p1 - %patch1 -p1 --%patch2 -p1 --%patch3 -p1 --%patch4 -p1 --%patch5 -p1 - - %build - autoreconf -ifv -@@ -152,7 +145,8 @@ rm -f %{buildroot}%{_libdir}/lib*.la - - %files - %defattr(-, root, root) --%doc AUTHORS COPYING ChangeLog NEWS README TODO -+%doc AUTHORS ChangeLog NEWS README TODO -+%license COPYING - %{_bindir}/faad - %{_mandir}/man1/faad.1.gz -
View file
_link
Changed
@@ -1,10 +1,1 @@ -<link project="Essentials" cicount="add" baserev="1ce96402f36b8c6702f72fbfdc13b61c"> - <patches> - <delete name="Fix-a-couple-buffer-overflows.patch" /> - <delete name="faad2-2.8.8.tar.gz" /> - <delete name="faad2-pic-fix.patch" /> - <delete name="sbr_hfadj-sanitize-frequency-band-borders.patch" /> - <delete name="syntax.c-check-for-syntax-element-inconsistencies.patch" /> - <apply name="project.diff" /> - </patches> -</link> +<link project="Essentials" cicount="add" />
View file
faad2-2.9.1.tar.gz
Deleted
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.