jpeg: use the package's shipped libjpeg.pc

and fix the references to our old crafted jpeg.pc.

src/cimg.mk

@@ -45,8 +45,8 @@ define $(PKG)_BUILD
         'CIMG_EXR_LIBS=`$(TARGET)-pkg-config --libs OpenEXR`' \
         'CIMG_PNG_INCDIR=`$(TARGET)-pkg-config --cflags libpng`' \
         'CIMG_PNG_LIBS=`$(TARGET)-pkg-config --libs libpng`' \
-        'CIMG_JPEG_INCDIR=`$(TARGET)-pkg-config --cflags jpeg`' \
+        'CIMG_JPEG_INCDIR=`$(TARGET)-pkg-config --cflags libjpeg`' \
-        'CIMG_JPEG_LIBS=`$(TARGET)-pkg-config --libs jpeg`' \
+        'CIMG_JPEG_LIBS=`$(TARGET)-pkg-config --libs libjpeg`' \
         'CIMG_ZLIB_INCDIR=`$(TARGET)-pkg-config --cflags zlib`' \
         'CIMG_ZLIB_LIBS=`$(TARGET)-pkg-config --libs zlib`' \
         'CIMG_OPENCV_INCDIR=`$(TARGET)-pkg-config --cflags opencv`' \

src/ghostscript.mk

@@ -57,7 +57,7 @@ define $(PKG)_BUILD
      echo 'Description: Ghostscript library'; \
      echo 'Cflags: -I"$(PREFIX)/$(TARGET)/include/ghostscript"'; \
      echo 'Libs: -L"$(PREFIX)/$(TARGET)/lib" -lgs'; \
-     echo 'Requires: fontconfig freetype2 libidn libtiff-4 libpng libopenjp2 jpeg lcms2 zlib'; \
+     echo 'Requires: fontconfig freetype2 libidn libtiff-4 libpng libopenjp2 libjpeg lcms2 zlib'; \
      echo '# https://github.com/mxe/mxe/issues/1446'; \
      echo 'Libs.private: -lm -liconv -lpaper -lwinspool';) \
      > '$(PREFIX)/$(TARGET)/lib/pkgconfig/ghostscript.pc'

src/jpeg.mk

@@ -21,16 +21,8 @@ define $(PKG)_BUILD
         $(MXE_CONFIGURE_OPTS)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
 
-    # create pkg-config file
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
-    (echo 'Name: jpeg'; \
-     echo 'Version: 0'; \
-     echo 'Description: jpeg'; \
-     echo 'Libs: -ljpeg';) \
-     > '$(PREFIX)/$(TARGET)/lib/pkgconfig/jpeg.pc'
-
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-jpeg.exe' \
-        `'$(TARGET)-pkg-config' jpeg --libs`
+        `'$(TARGET)-pkg-config' libjpeg --libs`
 endef

src/libmng.mk

@@ -17,7 +17,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    echo 'Requires: zlib lcms2 jpeg' >> '$(1)/libmng.pc.in'
+    echo 'Requires: zlib lcms2 libjpeg' >> '$(1)/libmng.pc.in'
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined'

src/netcdf-cxx4.mk

@@ -21,5 +21,5 @@ define $(PKG)_BUILD
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
         '$(SOURCE_DIR)/examples/simple_xy_rd.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        -l$(PKG) `'$(TARGET)-pkg-config' netcdf jpeg libcurl --cflags --libs` -lportablexdr
+        -l$(PKG) `'$(TARGET)-pkg-config' netcdf libjpeg libcurl --cflags --libs` -lportablexdr
 endef

src/netcdf.mk

@@ -28,5 +28,5 @@ define $(PKG)_BUILD
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(SOURCE_DIR)/examples/C/simple.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
-        `'$(TARGET)-pkg-config' $(PKG) jpeg libcurl --cflags --libs` -lportablexdr
+        `'$(TARGET)-pkg-config' $(PKG) libjpeg libcurl --cflags --libs` -lportablexdr
 endef