Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
4a1bd36f by Steve Lhomme at 2022-10-05T17:01:56+00:00
contrib: replace libjpeg with libjpeg-turbo
It should be faster and the license is the same type.
- - - - -
3 changed files:
- contrib/src/jpeg/SHA512SUMS
- − contrib/src/jpeg/no_executables.patch
- contrib/src/jpeg/rules.mak
Changes:
=====================================
contrib/src/jpeg/SHA512SUMS
=====================================
@@ -1 +1 @@
-74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
jpegsrc.v9b.tar.gz
+944004c5aec90695edde02ef88b5950683f006a90f9eb4fac40a3ef5cbfb2767344f962dd6a5342f5ea239e361d30ebd5960d0d16d1d68079602ccd745bcbadc
libjpeg-turbo-2.0.8-esr.tar.gz
=====================================
contrib/src/jpeg/no_executables.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- jpeg/Makefile.am.old 2018-11-20 16:49:53.187918820 +0100
-+++ jpeg/Makefile.am 2018-11-20 16:49:55.179918813 +0100
-@@ -76,7 +76,7 @@
- endif
-
- # Executables to build
--bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+EXTRA_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-
- # Executable sources & libs
- cjpeg_SOURCES = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \
=====================================
contrib/src/jpeg/rules.mak
=====================================
@@ -1,25 +1,26 @@
# jpeg
-JPEG_VERSION := 9b
-JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_VERSION := 2.0.8-esr
+JPEG_URL :=
$(GITHUB)/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(JPEG_VERSION).tar.gz
-$(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
+$(TARBALLS)/libjpeg-turbo-$(JPEG_VERSION).tar.gz:
$(call download_pkg,$(JPEG_URL),jpeg)
-.sum-jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz
+.sum-jpeg: libjpeg-turbo-$(JPEG_VERSION).tar.gz
-jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
+jpeg: libjpeg-turbo-$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK)
- mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
- $(APPLY) $(SRC)/jpeg/no_executables.patch
- $(UPDATE_AUTOCONFIG)
$(MOVE)
-.jpeg: jpeg
- $(RECONF)
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
- if test -e $(PREFIX)/lib/libjpeg.a; then $(RANLIB)
$(PREFIX)/lib/libjpeg.a; fi
+JPEG_CONF:= -DENABLE_SHARED=OFF -DWITH_TURBOJPEG=OFF
+ifndef HAVE_WIN32
+# this should probably be a global setting for CMake targets
+JPEG_CONF += -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
+endif
+
+.jpeg: jpeg toolchain.cmake
+ $(CMAKECLEAN)
+ $(HOSTVARS_PIC) $(CMAKE) $(JPEG_CONF)
+ +$(CMAKEBUILD)
+ +$(CMAKEBUILD) --target install
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4a1bd36fa14a53c42c5f77471c313ec79600a522
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4a1bd36fa14a53c42c5f77471c313ec79600a522
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
