cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
256d90190a
openbsd-ports/audio/faad/patches/patch-frontend_main_c

66 lines
2.1 KiB
Plaintext
Raw Normal View History

- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
$OpenBSD: patch-frontend_main_c,v 1.6 2008/09/15 21:58:19 jakemsr Exp $
--- frontend/main.c.orig Thu Nov 1 05:33:29 2007
+++ frontend/main.c Sun Aug 31 01:55:23 2008
@@ -41,6 +41,7 @@
#include <stdarg.h>
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
#include <stdlib.h>
#include <getopt.h>
+#include <string.h>
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
#include <neaacdec.h>
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
#include <mp4ff.h>
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -399,7 +400,7 @@ int decodeAACfile(char *aacfile, char *sndfile, char *
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
float *song_length)
{
int tagsize;
- unsigned long samplerate;
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
+ unsigned int samplerate;
unsigned char channels;
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
void *sample_buffer;
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -709,7 +710,7 @@ int decodeMP4file(char *mp4file, char *sndfile, char *
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
int infoOnly, int adts_out, float *song_length)
{
int track;
- unsigned long samplerate;
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
+ unsigned int samplerate;
unsigned char channels;
problem: libfaad uses data types with machine dependent bit width in prototypes in its public headers, but in the corresponding library code, machine independent exact width data types are used. solution: change libfaad headers to use the same machine independent exact width data types in the prototypes as in the library. since the prototypes in the library headers are changed, users of libfaad likely need to be modified to use exact width data types as well. also: - bump libfaad major version number - update plugin code to use exact width data types for libfaad interaction, as per new prototypes - bump package version - sync patches with update-patches problem discovered by, solution discussed with, reviewed, tested and OK naddy@
2007-06-29 02:01:42 -04:00
void *sample_buffer;
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -1085,7 +1086,7 @@ int main(int argc, char *argv[])
update to 2.0
2004-04-27 21:30:00 -04:00
if (optarg)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
char dr[10];
- if (sscanf(optarg, "%s", dr) < 1) {
+ if (sscanf(optarg, "%9s", dr) < 1) {
def_srate = 0;
} else {
def_srate = atoi(dr);
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -1096,7 +1097,7 @@ int main(int argc, char *argv[])
update to 2.0
2004-04-27 21:30:00 -04:00
if (optarg)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
char dr[10];
update to 2.0
2004-04-27 21:30:00 -04:00
- if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
format = 1;
} else {
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -1110,7 +1111,7 @@ int main(int argc, char *argv[])
update to 2.0
2004-04-27 21:30:00 -04:00
if (optarg)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
char dr[10];
update to 2.0
2004-04-27 21:30:00 -04:00
- if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
outputFormat = FAAD_FMT_16BIT; /* just use default */
} else {
- update to faad-2.6.1 - greatly simplify type-mismatch-correcting patches. most of the mismatches actually match on size and signedness, so only fix the ones that don't match. tested to work on sparc64 by naddy@ a while back. - libmp4v2 is no longer part of this package
2008-09-15 17:58:19 -04:00
@@ -1124,7 +1125,7 @@ int main(int argc, char *argv[])
update to 2.0
2004-04-27 21:30:00 -04:00
if (optarg)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
char dr[10];
update to 2.0
2004-04-27 21:30:00 -04:00
- if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1)
{
plug some unbounded sscanf in getopt processing
2003-04-26 16:42:00 -04:00
object_type = LC; /* default */
} else {
Reference in New Issue Copy Permalink