[med-svn] [Git][med-team/pvrg-jpeg][master] 5 commits: gcc-15.patch: new: fix build failures with standard C 2023.

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Sat Mar 1 19:30:26 GMT 2025 


Étienne Mollier pushed to branch master at Debian Med / pvrg-jpeg


Commits:
849ba129 by Étienne Mollier at 2025-03-01T20:25:39+01:00
gcc-15.patch: new: fix build failures with standard C 2023.

Closes: #1097666

- - - - -
b2f3b889 by Étienne Mollier at 2025-03-01T20:26:20+01:00
d/control: declare compliance to standards version 4.7.2.

- - - - -
97b8f299 by Étienne Mollier at 2025-03-01T20:28:39+01:00
gcc-15.patch: fix typos caught by lintian.

Gbp-Dch: ignore

- - - - -
1a799aee by Étienne Mollier at 2025-03-01T20:29:19+01:00
mayhem.patch: normalize Last-Update timestamp.

- - - - -
65f3f658 by Étienne Mollier at 2025-03-01T20:29:49+01:00
d/changelog: ready for upload to unstable.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/gcc-15.patch
- debian/patches/mayhem.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+pvrg-jpeg (1.2.1+dfsg1-9) unstable; urgency=medium
+
+  * gcc-15.patch: new: fix build failures with standard C 2023.
+    (Closes: #1097666)
+  * d/control: declare compliance to standards version 4.7.2.
+  * mayhem.patch: normalize Last-Update timestamp.
+
+ -- Étienne Mollier <emollier at debian.org>  Sat, 01 Mar 2025 20:29:44 +0100
+
 pvrg-jpeg (1.2.1+dfsg1-8) unstable; urgency=medium
 
   * d/control: declare compliance to standards version 4.7.0.


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                flex
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/med-team/pvrg-jpeg
 Vcs-Git: https://salsa.debian.org/med-team/pvrg-jpeg.git
 Homepage: https://jpeg.sourceforge.net/


=====================================
debian/patches/gcc-15.patch
=====================================
@@ -0,0 +1,519 @@
+Description: fix multiple issues cropping up with gcc-15.
+ Since gcc-15 defaults to standard C 2023, but pvrg-jpeg inherits from
+ K&R C code, it is necessary to bring a whole wealth of changes to
+ accommodate for the stronger typing that is now enforced.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/1097666
+Forwarded: no
+Last-Update: 2025-03-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- pvrg-jpeg.orig/leedct.c
++++ pvrg-jpeg/leedct.c
+@@ -30,8 +30,8 @@
+ 
+ /*PUBLIC*/
+ 
+-extern void LeeIDct();
+-extern void LeeDct();
++extern void LeeIDct(int*, int*);
++extern void LeeDct(int*, int*);
+ 
+ /*PRIVATE*/
+ 
+--- pvrg-jpeg.orig/chendct.c
++++ pvrg-jpeg/chendct.c
+@@ -33,8 +33,8 @@
+ 
+ /*PUBLIC*/
+ 
+-extern void ChenDct();
+-extern void ChenIDct();
++extern void ChenDct(int*, int*);
++extern void ChenIDct(int*, int*);
+ 
+ /*PRIVATE*/
+ 
+--- pvrg-jpeg.orig/io.c
++++ pvrg-jpeg/io.c
+@@ -46,33 +46,33 @@
+ 
+ /*PUBLIC*/
+ 
+-static BUFFER *MakeXBuffer();
+-static void WriteXBuffer();
+-static void ReadXBuffer();
+-static void ReadResizeBuffer();
+-static void FlushBuffer();
++static BUFFER *MakeXBuffer(int, int);
++static void WriteXBuffer(int, int*, BUFFER*);
++static void ReadXBuffer(int, int*, BUFFER*);
++static void ReadResizeBuffer(int, BUFFER*);
++static void FlushBuffer(BUFFER*);
+ static void BlockMoveTo();
+-static void ReadXBound();
+-static void WriteXBound();
++static void ReadXBound(int, int*, BUFFER*);
++static void WriteXBound(int, int*, BUFFER*);
+ 
+ static void LineMoveTo();
+ 
+-extern void ReadBlock();
+-extern void WriteBlock();
++extern void ReadBlock(int*);
++extern void WriteBlock(int*);
+ extern void ResizeIob();
+ extern void RewindIob();
+ extern void FlushIob();
+ extern void SeekEndIob();
+ extern void CloseIob();
+-extern void MakeIob();
++extern void MakeIob(int, int, int);
+ extern void PrintIob();
+-extern void InstallIob();
++extern void InstallIob(int);
+ extern void InstallHeaderIob();
+ extern void TerminateFile();
+ 
+-extern void ReadLine();
+-extern void ReadPreambleLine();
+-extern void WriteLine();
++extern void ReadLine(int, int*);
++extern void ReadPreambleLine(int, int*);
++extern void WriteLine(int, int*);
+ extern void LineResetBuffers();
+ 
+ 
+--- pvrg-jpeg.orig/jpeg.c
++++ pvrg-jpeg/jpeg.c
+@@ -45,7 +45,7 @@
+ 
+ /*PUBLIC*/
+ 
+-int main();
++int main(int, char**);
+ static void JpegEncodeFrame();
+ static void JpegDecodeFrame();
+ static void JpegDecodeScan();
+@@ -66,7 +66,7 @@
+ extern void JpegQuantizationFrame();
+ extern void JpegDefaultHuffmanScan();
+ extern void JpegFrequencyScan();
+-extern void JpegCustomScan();
++extern void JpegCustomScan(int);
+ extern void JpegEncodeScan();
+ 
+ extern void JpegLosslessFrequencyScan();
+--- pvrg-jpeg.orig/prototypes.h
++++ pvrg-jpeg/prototypes.h
+@@ -45,88 +45,88 @@
+ extern void JpegQuantizationFrame();
+ extern void JpegDefaultHuffmanScan();
+ extern void JpegFrequencyScan();
+-extern void JpegCustomScan();
++extern void JpegCustomScan(int);
+ extern void JpegEncodeScan();
+ extern void JpegLosslessFrequencyScan();
+ extern void JpegLosslessEncodeScan();
+ 
+ /* codec.c */
+ 
+-extern void FrequencyAC();
+-extern void EncodeAC();
+-extern void DecodeAC();
++extern void FrequencyAC(int*);
++extern void EncodeAC(int*);
++extern void DecodeAC(int*);
+ extern int DecodeDC();
+-extern void FrequencyDC();
+-extern void EncodeDC();
++extern void FrequencyDC(int);
++extern void EncodeDC(int);
+ extern void ResetCodec();
+ extern void ClearFrameFrequency();
+-extern void AddFrequency();
+-extern void InstallFrequency();
+-extern void InstallPrediction();
+-extern void PrintACEhuff();
+-extern void PrintDCEhuff();
+-extern int SizeACEhuff();
+-extern int SizeDCEhuff();
++extern void AddFrequency(int*, int*);
++extern void InstallFrequency(int);
++extern void InstallPrediction(int);
++extern void PrintACEhuff(int);
++extern void PrintDCEhuff(int);
++extern int SizeACEhuff(int);
++extern int SizeDCEhuff(int);
+ 
+ extern int LosslessDecodeDC();
+-extern void LosslessFrequencyDC();
+-extern void LosslessEncodeDC();
++extern void LosslessFrequencyDC(int);
++extern void LosslessEncodeDC(int);
+ 
+ /* huffman.c */
+ 
+-extern void MakeHuffman();
+-extern void SpecifiedHuffman();
++extern void MakeHuffman(int*);
++extern void SpecifiedHuffman(int*, int*);
+ extern void MakeDecoderHuffman();
+ extern void ReadHuffman();
+ extern void WriteHuffman();
+ extern int DecodeHuffman();
+-extern void EncodeHuffman();
++extern void EncodeHuffman(int);
+ extern void MakeXhuff();
+ extern void MakeEhuff();
+ extern void MakeDhuff();
+-extern void UseACHuffman();
+-extern void UseDCHuffman();
+-extern void UseDCHuffmanCheckingGEMSBug();
+-extern void SetACHuffman();
+-extern void SetDCHuffman();
++extern void UseACHuffman(int);
++extern void UseDCHuffman(int);
++extern void UseDCHuffmanCheckingGEMSBug(int, int*);
++extern void SetACHuffman(int);
++extern void SetDCHuffman(int);
+ extern void PrintHuffman();
+-extern void PrintTable();
++extern void PrintTable(int*);
+ 
+ /* io.c */
+ 
+ 
+-extern void ReadBlock();
+-extern void WriteBlock();
++extern void ReadBlock(int*);
++extern void WriteBlock(int*);
+ extern void ResizeIob();
+ extern void RewindIob();
+ extern void FlushIob();
+ extern void SeekEndIob();
+ extern void CloseIob();
+-extern void MakeIob();
++extern void MakeIob(int, int, int);
+ extern void PrintIob();
+ extern int NumberBlocksIob();
+ extern int NumberBlockMDUIob();
+-extern void InstallIob();
++extern void InstallIob(int);
+ extern void InstallHeaderIob();
+ extern void TerminateFile();
+ 
+ extern int NumberLineMDUIob();
+-extern void ReadLine();
+-extern void ReadPreambleLine();
+-extern void WriteLine();
++extern void ReadLine(int, int*);
++extern void ReadPreambleLine(int, int*);
++extern void WriteLine(int, int*);
+ extern int LineNumberMDUWideIob();
+ extern int LineNumberMDUHighIob();
+ extern void LineResetBuffers();
+ 
+ /* chendct.c */
+ 
+-extern void ChenDct();
+-extern void ChenIDct();
++extern void ChenDct(int*, int*);
++extern void ChenIDct(int*, int*);
+ 
+ /* leedct.c */
+ 
+-extern void LeeIDct();
+-extern void LeeDct();
++extern void LeeIDct(int*, int*);
++extern void LeeDct(int*, int*);
+ 
+ /* lexer.c */
+ 
+@@ -144,7 +144,7 @@
+ extern void WriteDqt();
+ extern void WriteSos();
+ extern void WriteDht();
+-extern void ReadSof();
++extern void ReadSof(int);
+ extern void ReadDqt();
+ extern void ReadDht();
+ extern void ReadDri();
+@@ -157,25 +157,25 @@
+ 
+ extern void initstream();
+ extern void pushstream();
+-extern void popstream();
+-extern void bpushc();
++extern void popstream(int);
++extern void bpushc(int);
+ extern int bgetc();
+ extern int bgetw();
+ extern int brtell();
+-extern int brseek();
+-extern void bputc();
+-extern void mropen();
++extern int brseek(int, int);
++extern void bputc(int);
++extern void mropen(char*, int);
+ extern void mrclose();
+-extern void mwopen();
++extern void mwopen(char*, int);
+ extern void swbytealign();
+ extern void mwclose();
+ extern long mwtell();
+ extern long mrtell();
+-extern void mwseek();
+-extern void mrseek();
++extern void mwseek(long);
++extern void mrseek(long);
+ extern int megetb();
+-extern void meputv();
+-extern int megetv();
++extern void meputv(int, int);
++extern int megetv(int);
+ extern int DoMarker();
+ extern int ScreenMarker();
+ extern void Resync();
+@@ -186,20 +186,20 @@
+ 
+ /* transform.c */
+ 
+-extern void ReferenceDct();
+-extern void ReferenceIDct();
+-extern void TransposeMatrix();
+-extern void Quantize();
+-extern void IQuantize();
+-extern void PreshiftDctMatrix();
+-extern void PostshiftIDctMatrix();
+-extern void BoundDctMatrix();
+-extern void BoundIDctMatrix();
+-extern void ZigzagMatrix();
+-extern void IZigzagMatrix();
+-extern int *ScaleMatrix();
+-extern void PrintMatrix();
+-extern void ClearMatrix();
++extern void ReferenceDct(int*, int*);
++extern void ReferenceIDct(int*, int*);
++extern void TransposeMatrix(int*, int*);
++extern void Quantize(int*, int*);
++extern void IQuantize(int*, int*);
++extern void PreshiftDctMatrix(int*, int);
++extern void PostshiftIDctMatrix(int*, int);
++extern void BoundDctMatrix(int*, int);
++extern void BoundIDctMatrix(int*, int);
++extern void ZigzagMatrix(int*, int*);
++extern void IZigzagMatrix(int*, int*);
++extern int *ScaleMatrix(int, int, int, int*);
++extern void PrintMatrix(int*);
++extern void ClearMatrix(int*);
+ 
+ #endif
+ 
+--- pvrg-jpeg.orig/stream.c
++++ pvrg-jpeg/stream.c
+@@ -38,22 +38,22 @@
+ 
+ extern void initstream();
+ extern void pushstream();
+-extern void popstream();
+-extern void bpushc();
++extern void popstream(int);
++extern void bpushc(int);
+ extern int bgetc();
+-extern void bputc();
+-extern void mropen();
++extern void bputc(int);
++extern void mropen(char*, int);
+ extern void mrclose();
+-extern void mwopen();
++extern void mwopen(char*, int);
+ extern void swbytealign();
+ extern void mwclose();
+ extern long mwtell();
+ extern long mrtell();
+-extern void mwseek();
+-extern void mrseek();
++extern void mwseek(long);
++extern void mrseek(long);
+ extern int megetb();
+-extern void meputv();
+-extern int megetv();
++extern void meputv(int, int);
++extern int megetv(int);
+ extern int DoMarker();
+ extern int ScreenMarker();
+ extern void Resync();
+--- pvrg-jpeg.orig/codec.c
++++ pvrg-jpeg/codec.c
+@@ -41,25 +41,25 @@
+ 
+ /*PUBLIC*/
+ 
+-extern void FrequencyAC();
+-extern void EncodeAC();
+-extern void DecodeAC();
++extern void FrequencyAC(int*);
++extern void EncodeAC(int*);
++extern void DecodeAC(int*);
+ extern int DecodeDC();
+-extern void FrequencyDC();
+-extern void EncodeDC();
++extern void FrequencyDC(int);
++extern void EncodeDC(int);
+ extern void ResetCodec();
+ extern void ClearFrameFrequency();
+-extern void AddFrequency();
+-extern void InstallFrequency();
+-extern void InstallPrediction();
+-extern void PrintACEhuff();
+-extern void PrintDCEhuff();
+-extern int SizeACEhuff();
+-extern int SizeDCEhuff();
++extern void AddFrequency(int*, int*);
++extern void InstallFrequency(int);
++extern void InstallPrediction(int);
++extern void PrintACEhuff(int);
++extern void PrintDCEhuff(int);
++extern int SizeACEhuff(int);
++extern int SizeDCEhuff(int);
+ 
+ extern int LosslessDecodeDC();
+-extern void LosslessFrequencyDC();
+-extern void LosslessEncodeDC();
++extern void LosslessFrequencyDC(int);
++extern void LosslessEncodeDC(int);
+ 
+ /*PRIVATE*/
+ 
+--- pvrg-jpeg.orig/huffman.c
++++ pvrg-jpeg/huffman.c
+@@ -47,23 +47,23 @@
+ static void OrderCodes();
+ static void DecoderTables();
+ 
+-extern void MakeHuffman();
+-extern void SpecifiedHuffman();
++extern void MakeHuffman(int*);
++extern void SpecifiedHuffman(int*, int*);
+ extern void MakeDecoderHuffman();
+ extern void ReadHuffman();
+ extern void WriteHuffman();
+ extern int DecodeHuffman();
+-extern void EncodeHuffman();
++extern void EncodeHuffman(int);
+ extern void MakeXhuff();
+ extern void MakeEhuff();
+ extern void MakeDhuff();
+-extern void UseACHuffman();
+-extern void UseDCHuffman();
+-extern void UseDCHuffmanCheckingGEMSBug();
+-extern void SetACHuffman();
+-extern void SetDCHuffman();
++extern void UseACHuffman(int);
++extern void UseDCHuffman(int);
++extern void UseDCHuffmanCheckingGEMSBug(int, int*);
++extern void SetACHuffman(int);
++extern void SetDCHuffman(int);
+ extern void PrintHuffman();
+-extern void PrintTable();
++extern void PrintTable(int*);
+ 
+ /*PRIVATE*/
+ 
+--- pvrg-jpeg.orig/lexer.c
++++ pvrg-jpeg/lexer.c
+@@ -173,9 +173,9 @@
+ extern void initparser();
+ extern void parser();
+ 
+-static int hashpjw();
+-static LINK * MakeLink();
+-static struct id * enter();
++static int hashpjw(char*);
++static LINK * MakeLink(int, char*, int);
++static struct id * enter(int, char*, int);
+ static int getint();
+ static char * getstr();
+ 
+--- pvrg-jpeg.orig/marker.c
++++ pvrg-jpeg/marker.c
+@@ -51,7 +51,7 @@
+ extern void WriteDqt();
+ extern void WriteSos();
+ extern void WriteDht();
+-extern void ReadSof();
++extern void ReadSof(int);
+ extern void ReadDqt();
+ extern void ReadDht();
+ extern void ReadDri();
+--- pvrg-jpeg.orig/transform.c
++++ pvrg-jpeg/transform.c
+@@ -37,24 +37,24 @@
+ 
+ /*PUBLIC*/
+ 
+-extern void ReferenceDct();
+-extern void ReferenceIDct();
+-extern void TransposeMatrix();
+-extern void Quantize();
+-extern void IQuantize();
+-extern void PreshiftDctMatrix();
+-extern void PostshiftIDctMatrix();
+-extern void BoundDctMatrix();
+-extern void BoundIDctMatrix();
+-extern void ZigzagMatrix();
+-extern void IZigzagMatrix();
+-extern int *ScaleMatrix();
+-extern void PrintMatrix();
+-extern void ClearMatrix();
++extern void ReferenceDct(int*, int*);
++extern void ReferenceIDct(int*, int*);
++extern void TransposeMatrix(int*, int*);
++extern void Quantize(int*, int*);
++extern void IQuantize(int*, int*);
++extern void PreshiftDctMatrix(int*, int);
++extern void PostshiftIDctMatrix(int*, int);
++extern void BoundDctMatrix(int*, int);
++extern void BoundIDctMatrix(int*, int);
++extern void ZigzagMatrix(int*, int*);
++extern void IZigzagMatrix(int*, int*);
++extern int *ScaleMatrix(int, int, int, int*);
++extern void PrintMatrix(int*);
++extern void ClearMatrix(int*);
+ 
+-static void DoubleReferenceDct1D();
+-static void DoubleReferenceIDct1D();
+-static void DoubleTransposeMatrix();
++static void DoubleReferenceDct1D(double*, double*);
++static void DoubleReferenceIDct1D(double*, double*);
++static void DoubleTransposeMatrix(double*, double*);
+ 
+ /*PRIVATE*/
+ 
+--- pvrg-jpeg.orig/lexer.l
++++ pvrg-jpeg/lexer.l
+@@ -159,9 +159,9 @@
+ extern void initparser();
+ extern void parser();
+ 
+-static int hashpjw();
+-static LINK * MakeLink();
+-static struct id * enter();
++static int hashpjw(char*);
++static LINK * MakeLink(int, char*, int);
++static struct id * enter(int, char*, int);
+ static int getint();
+ static char * getstr();
+ 
+--- pvrg-jpeg.orig/globals.h
++++ pvrg-jpeg/globals.h
+@@ -90,7 +90,7 @@
+ #define ERROR_MEMORY 12           /*Memory exceeded */
+ 
+ typedef int iFunc();
+-typedef void vFunc();
++typedef void vFunc(int*, int*);
+ 
+ /* A flag obtaining macro */
+ #define GetFlag(value,flag) (((value) & (flag)) ? 1:0)


=====================================
debian/patches/mayhem.patch
=====================================
@@ -1,5 +1,5 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 23 Dec 2015 21:52:21 +0100
+Last-Update: 2015-12-23
 Bug-Debian: https://bugs.debian.org/716141
 Description: Fix Mayhem issue (if only upstream would use getopt ...)
 


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ implicitdecl.patch
 mayhem.patch
 implicit-declarations.patch
 gcc-14.patch
+gcc-15.patch



View it on GitLab: https://salsa.debian.org/med-team/pvrg-jpeg/-/compare/ac9e0af756128630d2ef983a9cd28753092f6be1...65f3f658aab0a2f34375a1a9ab5a744c6ca17f0d

-- 
View it on GitLab: https://salsa.debian.org/med-team/pvrg-jpeg/-/compare/ac9e0af756128630d2ef983a9cd28753092f6be1...65f3f658aab0a2f34375a1a9ab5a744c6ca17f0d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20250301/3497f1c0/attachment-0001.htm>

More information about the debian-med-commit mailing list