Development April 2020

development@lists.ipfire.org

12 participants
133 discussions

[PATCH] libshout: Update to 2.4.3
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: http://icecast.org/news/libshout-release-2_4_3/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/libshout | 3 +++ lfs/libshout | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/libshout b/config/rootfiles/packages/libshout index 8f5b6a95b..ed781ffdf 100644 --- a/config/rootfiles/packages/libshout +++ b/config/rootfiles/packages/libshout @@ -1,5 +1,8 @@ #usr/include/shout #usr/include/shout/shout.h +#usr/lib/ckport +#usr/lib/ckport/db +#usr/lib/ckport/db/libshout.ckport #usr/lib/libshout.a #usr/lib/libshout.la usr/lib/libshout.so diff --git a/lfs/libshout b/lfs/libshout index f2b6c9af7..90d0f0346 100644 --- a/lfs/libshout +++ b/lfs/libshout @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2.2.2 +VER = 2.4.3 THISAPP = libshout-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libshout -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4f75fc9901c724b712c371c9a1e782d3 +$(DL_FILE)_MD5 = 2623ebf5bdf00517d2a7fd17d70c31aa install : $(TARGET) -- 2.18.0

1 0

[PATCH] libmpeg2: Update to 0.4.1
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: http://libmpeg2.sourceforge.net/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/libmpeg2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lfs/libmpeg2 b/lfs/libmpeg2 index 364cff1a8..86c1d2211 100644 --- a/lfs/libmpeg2 +++ b/lfs/libmpeg2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@ include Config -VER = 0.4.0b +VER = 0.4.1 THISAPP = mpeg2dec-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/mpeg2dec-0.4.0 +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpeg2 -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 52d10ea80595ec83d8557ba7ac6dc8e6 +$(DL_FILE)_MD5 = 7631b0a4bcfdd0d78c0bb0083080b0dc install : $(TARGET) -- 2.18.0

1 0

[PATCH] libogg: Update to 1.3.4
by Matthias Fischer 05 Apr '20

05 Apr '20

Changelog: "Version 1.3.4 (2019 August 30) * Faster slice-by-8 CRC32 implementation. see https://lwn.net/Articles/453931/ for motivation. * Add CMake build. * Deprecate Visual Studio project files in favor of CMake. * configure --disable-crc option for fuzzing. * Various build fixes. * Documentation and example code fixes. Version 1.3.3 (2017 November 7) * Fix an issue with corrupt continued packet handling. * Update Windows projects and build settings. * Remove Mac OS 9 build support. Version 1.3.2 (2014 May 27) * Fix an bug in oggpack_writecopy(). Version 1.3.1 (2013 May 12) * Guard against very large packets. * Respect the configure --docdir override. * Documentation fixes. * More Windows build fixes." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/libogg | 163 +++++++++++++++++-------------- lfs/libogg | 8 +- 2 files changed, 91 insertions(+), 80 deletions(-) diff --git a/config/rootfiles/packages/libogg b/config/rootfiles/packages/libogg index 21a8d63a5..0b53490cd 100644 --- a/config/rootfiles/packages/libogg +++ b/config/rootfiles/packages/libogg @@ -6,81 +6,92 @@ #usr/lib/libogg.la #usr/lib/libogg.so usr/lib/libogg.so.0 -usr/lib/libogg.so.0.8.0 +usr/lib/libogg.so.0.8.4 #usr/lib/pkgconfig/ogg.pc #usr/share/aclocal/ogg.m4 -#usr/share/doc/libogg-1.3.0 -#usr/share/doc/libogg-1.3.0/framing.html -#usr/share/doc/libogg-1.3.0/index.html -#usr/share/doc/libogg-1.3.0/ogg -#usr/share/doc/libogg-1.3.0/ogg-multiplex.html -#usr/share/doc/libogg-1.3.0/ogg/bitpacking.html -#usr/share/doc/libogg-1.3.0/ogg/datastructures.html -#usr/share/doc/libogg-1.3.0/ogg/decoding.html -#usr/share/doc/libogg-1.3.0/ogg/encoding.html -#usr/share/doc/libogg-1.3.0/ogg/general.html -#usr/share/doc/libogg-1.3.0/ogg/index.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_packet.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_packet_clear.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_bos.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_checksum_set.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_continued.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_eos.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_granulepos.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_packets.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_pageno.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_serialno.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_page_version.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_clear.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_destroy.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_eos.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_flush.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_init.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_packetin.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_packetout.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_packetpeek.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_pagein.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_pageout.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_pageout_fill.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_reset.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_reset_serialno.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_stream_state.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_buffer.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_clear.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_destroy.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_init.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_pageout.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_pageseek.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_reset.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_state.html -#usr/share/doc/libogg-1.3.0/ogg/ogg_sync_wrote.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_adv.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_adv1.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_bits.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_buffer.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_bytes.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_get_buffer.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_look.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_look1.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_read.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_read1.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_readinit.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_reset.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_write.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_writealign.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_writeclear.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_writecopy.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_writeinit.html -#usr/share/doc/libogg-1.3.0/ogg/oggpack_writetrunc.html -#usr/share/doc/libogg-1.3.0/ogg/overview.html -#usr/share/doc/libogg-1.3.0/ogg/reference.html -#usr/share/doc/libogg-1.3.0/ogg/style.css -#usr/share/doc/libogg-1.3.0/oggstream.html -#usr/share/doc/libogg-1.3.0/rfc3533.txt -#usr/share/doc/libogg-1.3.0/rfc5334.txt -#usr/share/doc/libogg-1.3.0/skeleton.html -#usr/share/doc/libogg-1.3.0/stream.png -#usr/share/doc/libogg-1.3.0/vorbisword2.png -#usr/share/doc/libogg-1.3.0/white-ogg.png -#usr/share/doc/libogg-1.3.0/white-xifish.png +#usr/share/doc/libogg +#usr/share/doc/libogg/fish_xiph_org.png +#usr/share/doc/libogg/framing.html +#usr/share/doc/libogg/index.html +#usr/share/doc/libogg/libogg +#usr/share/doc/libogg/libogg/bitpacking.html +#usr/share/doc/libogg/libogg/datastructures.html +#usr/share/doc/libogg/libogg/decoding.html +#usr/share/doc/libogg/libogg/encoding.html +#usr/share/doc/libogg/libogg/general.html +#usr/share/doc/libogg/libogg/index.html +#usr/share/doc/libogg/libogg/ogg_iovec_t.html +#usr/share/doc/libogg/libogg/ogg_packet.html +#usr/share/doc/libogg/libogg/ogg_packet_clear.html +#usr/share/doc/libogg/libogg/ogg_page.html +#usr/share/doc/libogg/libogg/ogg_page_bos.html +#usr/share/doc/libogg/libogg/ogg_page_checksum_set.html +#usr/share/doc/libogg/libogg/ogg_page_continued.html +#usr/share/doc/libogg/libogg/ogg_page_eos.html +#usr/share/doc/libogg/libogg/ogg_page_granulepos.html +#usr/share/doc/libogg/libogg/ogg_page_packets.html +#usr/share/doc/libogg/libogg/ogg_page_pageno.html +#usr/share/doc/libogg/libogg/ogg_page_serialno.html +#usr/share/doc/libogg/libogg/ogg_page_version.html +#usr/share/doc/libogg/libogg/ogg_stream_check.html +#usr/share/doc/libogg/libogg/ogg_stream_clear.html +#usr/share/doc/libogg/libogg/ogg_stream_destroy.html +#usr/share/doc/libogg/libogg/ogg_stream_eos.html +#usr/share/doc/libogg/libogg/ogg_stream_flush.html +#usr/share/doc/libogg/libogg/ogg_stream_flush_fill.html +#usr/share/doc/libogg/libogg/ogg_stream_init.html +#usr/share/doc/libogg/libogg/ogg_stream_iovecin.html +#usr/share/doc/libogg/libogg/ogg_stream_packetin.html +#usr/share/doc/libogg/libogg/ogg_stream_packetout.html +#usr/share/doc/libogg/libogg/ogg_stream_packetpeek.html +#usr/share/doc/libogg/libogg/ogg_stream_pagein.html +#usr/share/doc/libogg/libogg/ogg_stream_pageout.html +#usr/share/doc/libogg/libogg/ogg_stream_pageout_fill.html +#usr/share/doc/libogg/libogg/ogg_stream_reset.html +#usr/share/doc/libogg/libogg/ogg_stream_reset_serialno.html +#usr/share/doc/libogg/libogg/ogg_stream_state.html +#usr/share/doc/libogg/libogg/ogg_sync_buffer.html +#usr/share/doc/libogg/libogg/ogg_sync_check.html +#usr/share/doc/libogg/libogg/ogg_sync_clear.html +#usr/share/doc/libogg/libogg/ogg_sync_destroy.html +#usr/share/doc/libogg/libogg/ogg_sync_init.html +#usr/share/doc/libogg/libogg/ogg_sync_pageout.html +#usr/share/doc/libogg/libogg/ogg_sync_pageseek.html +#usr/share/doc/libogg/libogg/ogg_sync_reset.html +#usr/share/doc/libogg/libogg/ogg_sync_state.html +#usr/share/doc/libogg/libogg/ogg_sync_wrote.html +#usr/share/doc/libogg/libogg/oggpack_adv.html +#usr/share/doc/libogg/libogg/oggpack_adv1.html +#usr/share/doc/libogg/libogg/oggpack_bits.html +#usr/share/doc/libogg/libogg/oggpack_buffer.html +#usr/share/doc/libogg/libogg/oggpack_bytes.html +#usr/share/doc/libogg/libogg/oggpack_get_buffer.html +#usr/share/doc/libogg/libogg/oggpack_look.html +#usr/share/doc/libogg/libogg/oggpack_look1.html +#usr/share/doc/libogg/libogg/oggpack_read.html +#usr/share/doc/libogg/libogg/oggpack_read1.html +#usr/share/doc/libogg/libogg/oggpack_readinit.html +#usr/share/doc/libogg/libogg/oggpack_reset.html +#usr/share/doc/libogg/libogg/oggpack_write.html +#usr/share/doc/libogg/libogg/oggpack_writealign.html +#usr/share/doc/libogg/libogg/oggpack_writecheck.html +#usr/share/doc/libogg/libogg/oggpack_writeclear.html +#usr/share/doc/libogg/libogg/oggpack_writecopy.html +#usr/share/doc/libogg/libogg/oggpack_writeinit.html +#usr/share/doc/libogg/libogg/oggpack_writetrunc.html +#usr/share/doc/libogg/libogg/overview.html +#usr/share/doc/libogg/libogg/reference.html +#usr/share/doc/libogg/libogg/style.css +#usr/share/doc/libogg/multiplex1.png +#usr/share/doc/libogg/ogg-multiplex.html +#usr/share/doc/libogg/oggstream.html +#usr/share/doc/libogg/packets.png +#usr/share/doc/libogg/pages.png +#usr/share/doc/libogg/rfc3533.txt +#usr/share/doc/libogg/rfc5334.txt +#usr/share/doc/libogg/skeleton.html +#usr/share/doc/libogg/stream.png +#usr/share/doc/libogg/vorbisword2.png +#usr/share/doc/libogg/white-ogg.png +#usr/share/doc/libogg/white-xifish.png + diff --git a/lfs/libogg b/lfs/libogg index 49ca0185a..76a1e6813 100644 --- a/lfs/libogg +++ b/lfs/libogg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.3.0 +VER = 1.3.4 THISAPP = libogg-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libogg -PAK_VER = 3 +PAK_VER = 4 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 84a35715170f2cd4c77a4448772b95d5 +$(DL_FILE)_MD5 = eadef24aad6e3e8379ba0d14971fd64a install : $(TARGET) -- 2.18.0

1 0

[PATCH] lame: Update to 3.100
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: https://svn.code.sf.net/p/lame/svn/trunk/lame/doc/html/history.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/lame | 21 ++++++++++++--------- lfs/lame | 8 ++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/packages/lame b/config/rootfiles/packages/lame index 44fdc66bf..dc3ae8b94 100644 --- a/config/rootfiles/packages/lame +++ b/config/rootfiles/packages/lame @@ -7,17 +7,20 @@ usr/bin/lame usr/lib/libmp3lame.so usr/lib/libmp3lame.so.0 usr/lib/libmp3lame.so.0.0.0 -#usr/man/man1/lame.1 #usr/share/doc/lame #usr/share/doc/lame/html -#usr/share/doc/lame/html/basic.html +#usr/share/doc/lame/html/about.html +#usr/share/doc/lame/html/abr.html +#usr/share/doc/lame/html/cbr.html +#usr/share/doc/lame/html/contact.html #usr/share/doc/lame/html/contributors.html -#usr/share/doc/lame/html/examples.html +#usr/share/doc/lame/html/detailed.html #usr/share/doc/lame/html/history.html -#usr/share/doc/lame/html/id3.html #usr/share/doc/lame/html/index.html -#usr/share/doc/lame/html/lame.css -#usr/share/doc/lame/html/modes.html -#usr/share/doc/lame/html/node6.html -#usr/share/doc/lame/html/presets.html -#usr/share/doc/lame/html/switchs.html +#usr/share/doc/lame/html/introduction.html +#usr/share/doc/lame/html/links.html +#usr/share/doc/lame/html/list.html +#usr/share/doc/lame/html/ms_stereo.html +#usr/share/doc/lame/html/usage.html +#usr/share/doc/lame/html/vbr.html +#usr/share/man/man1/lame.1 diff --git a/lfs/lame b/lfs/lame index 9e0bee915..f7cbb2205 100644 --- a/lfs/lame +++ b/lfs/lame @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.97 +VER = 3.100 THISAPP = lame-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lame -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 90a4acbb730d150dfe80de145126eef7 +$(DL_FILE)_MD5 = 83e260acbe4389b54fe08e0bdbf7cddb install : $(TARGET) -- 2.18.0

1 0

[PATCH] New package: 'libmicrohttpd', needed for 'motion'
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: https://www.gnu.org/software/libmicrohttpd/ "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application." Changes: https://github.com/Karlson2k/libmicrohttpd/blob/master/ChangeLog Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/libmicrohttpd | 6 ++ lfs/libmicrohttpd | 96 +++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 103 insertions(+) create mode 100644 config/rootfiles/packages/libmicrohttpd create mode 100644 lfs/libmicrohttpd diff --git a/config/rootfiles/packages/libmicrohttpd b/config/rootfiles/packages/libmicrohttpd new file mode 100644 index 000000000..04e5b3cf4 --- /dev/null +++ b/config/rootfiles/packages/libmicrohttpd @@ -0,0 +1,6 @@ +#usr/include/microhttpd.h +#usr/lib/libmicrohttpd.la +#usr/lib/libmicrohttpd.so +usr/lib/libmicrohttpd.so.12 +usr/lib/libmicrohttpd.so.12.55.0 +#usr/lib/pkgconfig/libmicrohttpd.pc diff --git a/lfs/libmicrohttpd b/lfs/libmicrohttpd new file mode 100644 index 000000000..0819a2850 --- /dev/null +++ b/lfs/libmicrohttpd @@ -0,0 +1,96 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.9.70 + +THISAPP = libmicrohttpd-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libmicrohttpd +PAK_VER = 1 + +DEPS = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = dcd6045ecb4ea18c120afedccbd1da74 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/lighthttpd \ + --enable-static=no \ + --disable-nls \ + --enable-gcc-hardening \ + --enable-linker-hardening \ + --disable-doc \ + --disable-examples \ + --disable-sendfile \ + --enable-https + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5b310e2e0..c65d946ce 100755 --- a/make.sh +++ b/make.sh @@ -1521,6 +1521,7 @@ buildipfire() { lfsmake2 perl-DBD-SQLite lfsmake2 perl-File-ReadBackwards lfsmake2 openvmtools + lfsmake2 libmicrohttpd lfsmake2 motion lfsmake2 joe lfsmake2 monit -- 2.18.0

1 0

[PATCH v2] motion: Update to 4.3.0
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: https://github.com/Motion-Project/motion/releases This update is needed for 'ffmpeg 4.2.2' and 'libmicrohttpd 0.9.70' (new package). Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/motion | 42 ++++++++++++++++++++------------ lfs/motion | 14 +++++------ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion index 82a80973f..f93b24a91 100644 --- a/config/rootfiles/packages/motion +++ b/config/rootfiles/packages/motion @@ -5,30 +5,40 @@ etc/motion/camera2-dist.conf etc/motion/camera3-dist.conf etc/motion/camera4-dist.conf #etc/motion/motion-dist.conf +etc/rc.d/init.d/motion +etc/rc.d/rc0.d/K01motion +etc/rc.d/rc6.d/K01motion +etc/rc.d/rc3.d/S99motion usr/bin/motion #usr/share/doc/motion -#usr/share/doc/motion/CHANGELOG #usr/share/doc/motion/COPYING #usr/share/doc/motion/CREDITS -#usr/share/doc/motion/README.md #usr/share/doc/motion/mask1.png +#usr/share/doc/motion/motion_build.html +#usr/share/doc/motion/motion_config.html #usr/share/doc/motion/motion_guide.html +#usr/share/doc/motion/motion_stylesheet.css #usr/share/doc/motion/normal.jpg #usr/share/doc/motion/outputmotion1.jpg #usr/share/doc/motion/outputnormal1.jpg +#usr/share/locale/da/LC_MESSAGES/motion.mo +#usr/share/locale/de/LC_MESSAGES/motion.mo +#usr/share/locale/es/LC_MESSAGES/motion.mo +#usr/share/locale/fi/LC_MESSAGES/motion.mo +#usr/share/locale/fr/LC_MESSAGES/motion.mo +#usr/share/locale/it/LC_MESSAGES/motion.mo +#usr/share/locale/ja/LC_MESSAGES/motion.mo +#usr/share/locale/ko/LC_MESSAGES/motion.mo +#usr/share/locale/li +#usr/share/locale/li/LC_MESSAGES +#usr/share/locale/li/LC_MESSAGES/motion.mo +#usr/share/locale/nl/LC_MESSAGES/motion.mo +#usr/share/locale/no +#usr/share/locale/no/LC_MESSAGES +#usr/share/locale/no/LC_MESSAGES/motion.mo +#usr/share/locale/pt/LC_MESSAGES/motion.mo +#usr/share/locale/sk/LC_MESSAGES/motion.mo +#usr/share/locale/sv/LC_MESSAGES/motion.mo +#usr/share/locale/zh/LC_MESSAGES/motion.mo #usr/share/man/man1/motion.1 -#usr/share/motion -#usr/share/motion/examples -#usr/share/motion/examples/camera1-dist.conf -#usr/share/motion/examples/camera2-dist.conf -#usr/share/motion/examples/camera3-dist.conf -#usr/share/motion/examples/camera4-dist.conf -#usr/share/motion/examples/motion-dist.conf -#usr/share/motion/examples/motion.init-Debian -#usr/share/motion/examples/motion.init-FreeBSD.sh -#usr/share/motion/examples/motion.service var/ipfire/backup/addons/includes/motion -etc/rc.d/init.d/motion -etc/rc.d/rc0.d/K01motion -etc/rc.d/rc6.d/K01motion -etc/rc.d/rc3.d/S99motion diff --git a/lfs/motion b/lfs/motion index c00fde89e..f28e4ba99 100644 --- a/lfs/motion +++ b/lfs/motion @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,17 +24,17 @@ include Config -VER = 4.0.1 +VER = 4.3.0 -THISAPP = motion-release-$(VER) +THISAPP = motion-Release-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = motion -PAK_VER = 2 -DEPS = ffmpeg +PAK_VER = 3 +DEPS = ffmpeg libmicrohttpd ############################################################################### # Top-level Rules @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5c87f90c4118d8cf0fb14700db69118f +$(DL_FILE)_MD5 = 297aab6ec3de74ce1a0d2b1711ac9062 install : $(TARGET) @@ -67,7 +67,7 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) : $(subst %,%_MD5,$(objects)) : @$(MD5) -dist: +dist: @$(PAK) ############################################################################### -- 2.18.0

1 0

[PATCH v2] ffmpeg: Update to 4.2.2
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: http://ffmpeg.org/download.html#release_4.2 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/ffmpeg | 346 ++++++++----------------------- lfs/ffmpeg | 9 +- 2 files changed, 97 insertions(+), 258 deletions(-) diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index 755764666..ed013bc22 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -1,254 +1,92 @@ -usr/bin/ffmpeg -usr/bin/ffprobe -usr/bin/ffserver -#usr/include/libavcodec -#usr/include/libavcodec/avcodec.h -#usr/include/libavcodec/avdct.h -#usr/include/libavcodec/avfft.h -#usr/include/libavcodec/d3d11va.h -#usr/include/libavcodec/dirac.h -#usr/include/libavcodec/dv_profile.h -#usr/include/libavcodec/dxva2.h -#usr/include/libavcodec/jni.h -#usr/include/libavcodec/mediacodec.h -#usr/include/libavcodec/qsv.h -#usr/include/libavcodec/vaapi.h -#usr/include/libavcodec/vda.h -#usr/include/libavcodec/vdpau.h -#usr/include/libavcodec/version.h -#usr/include/libavcodec/videotoolbox.h -#usr/include/libavcodec/vorbis_parser.h -#usr/include/libavcodec/xvmc.h -#usr/include/libavdevice -#usr/include/libavdevice/avdevice.h -#usr/include/libavdevice/version.h -#usr/include/libavfilter -#usr/include/libavfilter/avfilter.h -#usr/include/libavfilter/avfiltergraph.h -#usr/include/libavfilter/buffersink.h -#usr/include/libavfilter/buffersrc.h -#usr/include/libavfilter/version.h -#usr/include/libavformat -#usr/include/libavformat/avformat.h -#usr/include/libavformat/avio.h -#usr/include/libavformat/version.h -#usr/include/libavresample -#usr/include/libavresample/avresample.h -#usr/include/libavresample/version.h -#usr/include/libavutil -#usr/include/libavutil/adler32.h -#usr/include/libavutil/aes.h -#usr/include/libavutil/aes_ctr.h -#usr/include/libavutil/attributes.h -#usr/include/libavutil/audio_fifo.h -#usr/include/libavutil/avassert.h -#usr/include/libavutil/avconfig.h -#usr/include/libavutil/avstring.h -#usr/include/libavutil/avutil.h -#usr/include/libavutil/base64.h -#usr/include/libavutil/blowfish.h -#usr/include/libavutil/bprint.h -#usr/include/libavutil/bswap.h -#usr/include/libavutil/buffer.h -#usr/include/libavutil/camellia.h -#usr/include/libavutil/cast5.h -#usr/include/libavutil/channel_layout.h -#usr/include/libavutil/common.h -#usr/include/libavutil/cpu.h -#usr/include/libavutil/crc.h -#usr/include/libavutil/des.h -#usr/include/libavutil/dict.h -#usr/include/libavutil/display.h -#usr/include/libavutil/downmix_info.h -#usr/include/libavutil/error.h -#usr/include/libavutil/eval.h -#usr/include/libavutil/ffversion.h -#usr/include/libavutil/fifo.h -#usr/include/libavutil/file.h -#usr/include/libavutil/frame.h -#usr/include/libavutil/hash.h -#usr/include/libavutil/hmac.h -#usr/include/libavutil/hwcontext.h -#usr/include/libavutil/hwcontext_cuda.h -#usr/include/libavutil/hwcontext_d3d11va.h -#usr/include/libavutil/hwcontext_drm.h -#usr/include/libavutil/hwcontext_dxva2.h -#usr/include/libavutil/hwcontext_qsv.h -#usr/include/libavutil/hwcontext_vaapi.h -#usr/include/libavutil/hwcontext_vdpau.h -#usr/include/libavutil/hwcontext_videotoolbox.h -#usr/include/libavutil/imgutils.h -#usr/include/libavutil/intfloat.h -#usr/include/libavutil/intreadwrite.h -#usr/include/libavutil/lfg.h -#usr/include/libavutil/log.h -#usr/include/libavutil/lzo.h -#usr/include/libavutil/macros.h -#usr/include/libavutil/mastering_display_metadata.h -#usr/include/libavutil/mathematics.h -#usr/include/libavutil/md5.h -#usr/include/libavutil/mem.h -#usr/include/libavutil/motion_vector.h -#usr/include/libavutil/murmur3.h -#usr/include/libavutil/opt.h -#usr/include/libavutil/parseutils.h -#usr/include/libavutil/pixdesc.h -#usr/include/libavutil/pixelutils.h -#usr/include/libavutil/pixfmt.h -#usr/include/libavutil/random_seed.h -#usr/include/libavutil/rational.h -#usr/include/libavutil/rc4.h -#usr/include/libavutil/replaygain.h -#usr/include/libavutil/ripemd.h -#usr/include/libavutil/samplefmt.h -#usr/include/libavutil/sha.h -#usr/include/libavutil/sha512.h -#usr/include/libavutil/spherical.h -#usr/include/libavutil/stereo3d.h -#usr/include/libavutil/tea.h -#usr/include/libavutil/threadmessage.h -#usr/include/libavutil/time.h -#usr/include/libavutil/timecode.h -#usr/include/libavutil/timestamp.h -#usr/include/libavutil/tree.h -#usr/include/libavutil/twofish.h -#usr/include/libavutil/version.h -#usr/include/libavutil/xtea.h -#usr/include/libpostproc -#usr/include/libpostproc/postprocess.h -#usr/include/libpostproc/version.h -#usr/include/libswresample -#usr/include/libswresample/swresample.h -#usr/include/libswresample/version.h -#usr/include/libswscale -#usr/include/libswscale/swscale.h -#usr/include/libswscale/version.h -#usr/lib/libavcodec.a -#usr/lib/libavcodec.so -usr/lib/libavcodec.so.57 -usr/lib/libavcodec.so.57.107.100 -#usr/lib/libavdevice.a -#usr/lib/libavdevice.so -usr/lib/libavdevice.so.57 -usr/lib/libavdevice.so.57.10.100 -#usr/lib/libavfilter.a -#usr/lib/libavfilter.so -usr/lib/libavfilter.so.6 -usr/lib/libavfilter.so.6.107.100 -#usr/lib/libavformat.a -#usr/lib/libavformat.so -usr/lib/libavformat.so.57 -usr/lib/libavformat.so.57.83.100 -#usr/lib/libavresample.a -#usr/lib/libavresample.so -usr/lib/libavresample.so.3 -usr/lib/libavresample.so.3.7.0 -#usr/lib/libavutil.a -#usr/lib/libavutil.so -usr/lib/libavutil.so.55 -usr/lib/libavutil.so.55.78.100 -#usr/lib/libpostproc.a -#usr/lib/libpostproc.so -usr/lib/libpostproc.so.54 -usr/lib/libpostproc.so.54.7.100 -#usr/lib/libswresample.a -#usr/lib/libswresample.so -usr/lib/libswresample.so.2 -usr/lib/libswresample.so.2.9.100 -#usr/lib/libswscale.a -#usr/lib/libswscale.so -usr/lib/libswscale.so.4 -usr/lib/libswscale.so.4.8.100 -#usr/lib/pkgconfig/libavcodec.pc -#usr/lib/pkgconfig/libavdevice.pc -#usr/lib/pkgconfig/libavfilter.pc -#usr/lib/pkgconfig/libavformat.pc -#usr/lib/pkgconfig/libavresample.pc -#usr/lib/pkgconfig/libavutil.pc -#usr/lib/pkgconfig/libpostproc.pc -#usr/lib/pkgconfig/libswresample.pc -#usr/lib/pkgconfig/libswscale.pc -#usr/share/doc/ffmpeg -#usr/share/doc/ffmpeg/developer.html -#usr/share/doc/ffmpeg/faq.html -#usr/share/doc/ffmpeg/fate.html -#usr/share/doc/ffmpeg/ffmpeg-all.html -#usr/share/doc/ffmpeg/ffmpeg-bitstream-filters.html -#usr/share/doc/ffmpeg/ffmpeg-codecs.html -#usr/share/doc/ffmpeg/ffmpeg-devices.html -#usr/share/doc/ffmpeg/ffmpeg-filters.html -#usr/share/doc/ffmpeg/ffmpeg-formats.html -#usr/share/doc/ffmpeg/ffmpeg-protocols.html -#usr/share/doc/ffmpeg/ffmpeg-resampler.html -#usr/share/doc/ffmpeg/ffmpeg-scaler.html -#usr/share/doc/ffmpeg/ffmpeg-utils.html -#usr/share/doc/ffmpeg/ffmpeg.html -#usr/share/doc/ffmpeg/ffprobe-all.html -#usr/share/doc/ffmpeg/ffprobe.html -#usr/share/doc/ffmpeg/ffserver-all.html -#usr/share/doc/ffmpeg/ffserver.html -#usr/share/doc/ffmpeg/general.html -#usr/share/doc/ffmpeg/git-howto.html -#usr/share/doc/ffmpeg/libavcodec.html -#usr/share/doc/ffmpeg/libavdevice.html -#usr/share/doc/ffmpeg/libavfilter.html -#usr/share/doc/ffmpeg/libavformat.html -#usr/share/doc/ffmpeg/libavutil.html -#usr/share/doc/ffmpeg/libswresample.html -#usr/share/doc/ffmpeg/libswscale.html -#usr/share/doc/ffmpeg/mailing-list-faq.html -#usr/share/doc/ffmpeg/nut.html -#usr/share/doc/ffmpeg/platform.html -#usr/share/ffmpeg -#usr/share/ffmpeg/examples -#usr/share/ffmpeg/examples/Makefile -#usr/share/ffmpeg/examples/README -#usr/share/ffmpeg/examples/avio_dir_cmd.c -#usr/share/ffmpeg/examples/avio_reading.c -#usr/share/ffmpeg/examples/decode_audio.c -#usr/share/ffmpeg/examples/decode_video.c -#usr/share/ffmpeg/examples/demuxing_decoding.c -#usr/share/ffmpeg/examples/encode_audio.c -#usr/share/ffmpeg/examples/encode_video.c -#usr/share/ffmpeg/examples/extract_mvs.c -#usr/share/ffmpeg/examples/filter_audio.c -#usr/share/ffmpeg/examples/filtering_audio.c -#usr/share/ffmpeg/examples/filtering_video.c -#usr/share/ffmpeg/examples/http_multiclient.c -#usr/share/ffmpeg/examples/hw_decode.c -#usr/share/ffmpeg/examples/metadata.c -#usr/share/ffmpeg/examples/muxing.c -#usr/share/ffmpeg/examples/qsvdec.c -#usr/share/ffmpeg/examples/remuxing.c -#usr/share/ffmpeg/examples/resampling_audio.c -#usr/share/ffmpeg/examples/scaling_video.c -#usr/share/ffmpeg/examples/transcode_aac.c -#usr/share/ffmpeg/examples/transcoding.c -#usr/share/ffmpeg/ffprobe.xsd -#usr/share/ffmpeg/libvpx-1080p.ffpreset -#usr/share/ffmpeg/libvpx-1080p50_60.ffpreset -#usr/share/ffmpeg/libvpx-360p.ffpreset -#usr/share/ffmpeg/libvpx-720p.ffpreset -#usr/share/ffmpeg/libvpx-720p50_60.ffpreset -#usr/share/man/man1/ffmpeg-all.1 -#usr/share/man/man1/ffmpeg-bitstream-filters.1 -#usr/share/man/man1/ffmpeg-codecs.1 -#usr/share/man/man1/ffmpeg-devices.1 -#usr/share/man/man1/ffmpeg-filters.1 -#usr/share/man/man1/ffmpeg-formats.1 -#usr/share/man/man1/ffmpeg-protocols.1 -#usr/share/man/man1/ffmpeg-resampler.1 -#usr/share/man/man1/ffmpeg-scaler.1 -#usr/share/man/man1/ffmpeg-utils.1 -#usr/share/man/man1/ffmpeg.1 -#usr/share/man/man1/ffprobe-all.1 -#usr/share/man/man1/ffprobe.1 -#usr/share/man/man1/ffserver-all.1 -#usr/share/man/man1/ffserver.1 -#usr/share/man/man3/libavcodec.3 -#usr/share/man/man3/libavdevice.3 -#usr/share/man/man3/libavfilter.3 -#usr/share/man/man3/libavformat.3 -#usr/share/man/man3/libavutil.3 -#usr/share/man/man3/libswresample.3 -#usr/share/man/man3/libswscale.3 +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.2.2 + +THISAPP = ffmpeg-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = ffmpeg +PAK_VER = 9 + +DEPS = sdl lame libvorbis xvid + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 829d56f158832dbf669b5b417af48060 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-shared \ + --enable-gpl \ + --enable-version3 \ + --enable-avfilter \ + --enable-avresample + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 3e705c2d5..ed013bc22 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.4 +VER = 4.2.2 THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 8 +PAK_VER = 9 DEPS = sdl lame libvorbis xvid @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4d368db3431895d140e6f5f7b4987911 +$(DL_FILE)_MD5 = 829d56f158832dbf669b5b417af48060 install : $(TARGET) @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ --prefix=/usr \ --enable-shared \ -- 2.18.0

1 0

[PATCH v2] libpng: Update to 1.6.37
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: http://www[dot]libpng[dot]org/pub/png/libpng[dot]html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libpng | 26 ++++++++++++++------------ lfs/libpng | 8 ++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng index 9a20880a1..fa776cf9f 100644 --- a/config/rootfiles/common/libpng +++ b/config/rootfiles/common/libpng @@ -1,22 +1,24 @@ #usr/bin/libpng-config -#usr/bin/libpng12-config -#usr/include/libpng12 -#usr/include/libpng12/png.h -#usr/include/libpng12/pngconf.h +#usr/bin/libpng16-config +#usr/bin/png-fix-itxt +#usr/bin/pngfix +#usr/include/libpng16 +#usr/include/libpng16/png.h +#usr/include/libpng16/pngconf.h +#usr/include/libpng16/pnglibconf.h #usr/include/png.h #usr/include/pngconf.h +#usr/include/pnglibconf.h #usr/lib/libpng.a #usr/lib/libpng.la usr/lib/libpng.so -usr/lib/libpng.so.3 -usr/lib/libpng.so.3.57.0 -#usr/lib/libpng12.a -#usr/lib/libpng12.la -usr/lib/libpng12.so -usr/lib/libpng12.so.0 -usr/lib/libpng12.so.0.57.0 +#usr/lib/libpng16.a +#usr/lib/libpng16.la +usr/lib/libpng16.so +usr/lib/libpng16.so.16 +usr/lib/libpng16.so.16.37.0 #usr/lib/pkgconfig/libpng.pc -#usr/lib/pkgconfig/libpng12.pc +#usr/lib/pkgconfig/libpng16.pc #usr/share/man/man3/libpng.3 #usr/share/man/man3/libpngpf.3 #usr/share/man/man5/png.5 diff --git a/lfs/libpng b/lfs/libpng index 8f935dfd4..76cc7d2d0 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 1.2.57 +VER = 1.6.37 THISAPP = libpng-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dfcda3603e29dcc11870c48f838ef75b +$(DL_FILE)_MD5 = 015e8e15db1eecde5f2eb9eb5b6e59e9 install : $(TARGET) -- 2.18.0

1 0

[PATCH v2] 'make.sh':'libarchive' and 'cmake' now need to be built prior to 'libjepeg'
by Matthias Fischer 05 Apr '20

05 Apr '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index c250d56fc..5b310e2e0 100755 --- a/make.sh +++ b/make.sh @@ -1253,6 +1253,8 @@ buildipfire() { lfsmake2 libnl-3 lfsmake2 libidn lfsmake2 nasm + lfsmake2 libarchive + lfsmake2 cmake lfsmake2 libjpeg lfsmake2 libjpeg-compat lfsmake2 libexif @@ -1281,8 +1283,6 @@ buildipfire() { lfsmake2 bootstrap lfsmake2 arping lfsmake2 beep - lfsmake2 libarchive - lfsmake2 cmake lfsmake2 libssh lfsmake2 cdrkit lfsmake2 dosfstools -- 2.18.0

1 0

[PATCH v2] libjpeg: Update to 2.0.4
by Matthias Fischer 05 Apr '20

05 Apr '20

For details see: https://sourceforge.net/projects/libjpeg-turbo/files/2.0.4/ Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/libjpeg | 9 ++++----- lfs/libjpeg | 25 +++++++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 1c56023c4..eb74d2c50 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -9,23 +9,22 @@ #usr/include/jmorecfg.h #usr/include/jpeglib.h #usr/include/turbojpeg.h -#usr/lib/libjpeg.la #usr/lib/libjpeg.so usr/lib/libjpeg.so.8 -usr/lib/libjpeg.so.8.1.2 -#usr/lib/libturbojpeg.la +usr/lib/libjpeg.so.8.2.2 #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.1.0 +usr/lib/libturbojpeg.so.0.2.0 #usr/lib/pkgconfig/libjpeg.pc #usr/lib/pkgconfig/libturbojpeg.pc #usr/share/doc/libjpeg-turbo #usr/share/doc/libjpeg-turbo/LICENSE.md #usr/share/doc/libjpeg-turbo/README.ijg #usr/share/doc/libjpeg-turbo/README.md -#usr/share/doc/libjpeg-turbo/example.c +#usr/share/doc/libjpeg-turbo/example.txt #usr/share/doc/libjpeg-turbo/libjpeg.txt #usr/share/doc/libjpeg-turbo/structure.txt +#usr/share/doc/libjpeg-turbo/tjexample.c #usr/share/doc/libjpeg-turbo/usage.txt #usr/share/doc/libjpeg-turbo/wizard.txt #usr/share/man/man1/cjpeg.1 diff --git a/lfs/libjpeg b/lfs/libjpeg index 6251fc85b..1fbcdf02a 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.5.1 +VER = 2.0.4 THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 55deb139b0cac3c8200b75d485fc13f3 +$(DL_FILE)_MD5 = d01d9e0c28c27bc0de9f4e2e8ff49855 install : $(TARGET) @@ -70,12 +70,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --with-jpeg8 \ - --disable-static\ - --mandir=/usr/share/man - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RELEASE \ + -DENABLE_STATIC=FALSE \ + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/libjpeg-turbo \ + -DCMAKE_INSTALL_MANDIR=/usr/share/man \ + -DCMAKE_INSTALL_DEFAULT_LIBDIR=/usr/lib \ + -DWITH_JPEG8=1 + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) @$(POSTBUILD) - -- 2.18.0

1 0

← Newer
1
...
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2020