Ninja was merged to base and therefore we can now use normal cmake.mk

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Unconditionally enable with BUILD_PATENTED.

Simplify configure args.

Add missing PKG_CONFIG_DEPENDS

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

Host's libfreetype is being linked during build.

libtool: warning: relinking 'MagickWand/libMagickWand-7.Q8.la'
libtool: install: (cd /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5; /bin/sh "/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/libtool"  --tag CC --mode=relink arm-openwrt-linux-muslgnueabi-gcc -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/freetype2 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -mfloat-abi=hard -fmacro-prefix-map=/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5=ImageMagick-7.0.9-5 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -flto -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=8 -no-undefined -Wl,--version-script=./MagickWand/libMagickWand.map -version-info 7:0:0 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -znow -zrelro -o MagickWand/libMagickWand-7.Q8.la -rpath /usr/lib MagickWand/libMagickWand_7_Q8_la-animate.lo MagickWand/libMagickWand_7_Q8_la-compare.lo MagickWand/libMagickWand_7_Q8_la-composite.lo MagickWand/libMagickWand_7_Q8_la-conjure.lo MagickWand/libMagickWand_7_Q8_la-convert.lo MagickWand/libMagickWand_7_Q8_la-deprecate.lo MagickWand/libMagickWand_7_Q8_la-display.lo MagickWand/libMagickWand_7_Q8_la-drawing-wand.lo MagickWand/libMagickWand_7_Q8_la-identify.lo MagickWand/libMagickWand_7_Q8_la-import.lo MagickWand/libMagickWand_7_Q8_la-magick-cli.lo MagickWand/libMagickWand_7_Q8_la-magick-image.lo MagickWand/libMagickWand_7_Q8_la-magick-property.lo MagickWand/libMagickWand_7_Q8_la-magick-wand.lo MagickWand/libMagickWand_7_Q8_la-mogrify.lo MagickWand/libMagickWand_7_Q8_la-montage.lo MagickWand/libMagickWand_7_Q8_la-operation.lo MagickWand/libMagickWand_7_Q8_la-pixel-iterator.lo MagickWand/libMagickWand_7_Q8_la-pixel-wand.lo MagickWand/libMagickWand_7_Q8_la-script-token.lo MagickWand/libMagickWand_7_Q8_la-stream.lo MagickWand/libMagickWand_7_Q8_la-wand.lo MagickWand/libMagickWand_7_Q8_la-wandcli.lo MagickWand/libMagickWand_7_Q8_la-wand-view.lo MagickCore/libMagickCore-7.Q8.la -lm -inst-prefix-dir /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install)
libtool: relink: arm-openwrt-linux-muslgnueabi-gcc -shared  -fPIC -DPIC  MagickWand/.libs/libMagickWand_7_Q8_la-animate.o MagickWand/.libs/libMagickWand_7_Q8_la-compare.o MagickWand/.libs/libMagickWand_7_Q8_la-composite.o MagickWand/.libs/libMagickWand_7_Q8_la-conjure.o MagickWand/.libs/libMagickWand_7_Q8_la-convert.o MagickWand/.libs/libMagickWand_7_Q8_la-deprecate.o MagickWand/.libs/libMagickWand_7_Q8_la-display.o MagickWand/.libs/libMagickWand_7_Q8_la-drawing-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-identify.o MagickWand/.libs/libMagickWand_7_Q8_la-import.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-cli.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-image.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-property.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-mogrify.o MagickWand/.libs/libMagickWand_7_Q8_la-montage.o MagickWand/.libs/libMagickWand_7_Q8_la-operation.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-iterator.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-script-token.o MagickWand/.libs/libMagickWand_7_Q8_la-stream.o MagickWand/.libs/libMagickWand_7_Q8_la-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-wandcli.o MagickWand/.libs/libMagickWand_7_Q8_la-wand-view.o   -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -L/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install/usr/lib -L/usr/lib -lMagickCore-7.Q8 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/lib -lfreetype -lz -lltdl -lm  -Os -mfloat-abi=hard -fstack-protector -Wl,-z -Wl,now -Wl,-z -Wl,relro -flto -pthread -Wl,--version-script=./MagickWand/libMagickWand.map   -pthread -Wl,-soname -Wl,libMagickWand-7.Q8.so.7 -o MagickWand/.libs/libMagickWand-7.Q8.so.7.0.0
/usr/lib/libfreetype.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
libtool:   error: error: relink 'MagickWand/libMagickWand-7.Q8.la' with the above command before installing it
make[5]: *** [Makefile:6264: install-libLTLIBRARIES] Error 1
make[5]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[4]: *** [Makefile:12263: install-am] Error 2
make[4]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[3]: *** [Makefile:12257: install] Error 2
make[3]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[2]: *** [Makefile:153: /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/.built] Error 2
make[2]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/feeds/packages/multimedia/imagemagick'
time: package/feeds/packages/imagemagick/compile#105.77#18.23#212.14
    ERROR: package/feeds/packages/imagemagick failed to build.
make[1]: *** [package/Makefile:114: package/feeds/packages/imagemagick/compile] Error 1
make[1]: Leaving directory '/home/egorenar/Repositories/openwrt-rel'
make: *** [/home/egorenar/Repositories/openwrt-rel/include/toplevel.mk:230: package/imagemagick/compile] Error 2

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

Switch to AUTORELEASE for simplicity.

Switch to building with Ninja for faster compilation.

Modify PKG_UNPACK instead of overriding Build/Prepare.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Update live555 as well.

Switch to building with ninja for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Switch to AUTORELEASE for simplicity.

Switch to building with ninja for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Signed-off-by: Rosen Penev <rosenp@gmail.com>

We need to copy MagickWand-config, which handles pkg-config data, to the
staging dir, so that dependent packages can use it.  php7-pecl-imagick,
for example, may otherwise use an eventual host-installed file, causing
compilation to fail.  There's also a MagickCore-config file that does
the same thing for the MagickCore library, so a *-config wilcard is used
to handle all cases.

Since configure is called with --prefix=/usr, use $(SED) to change
definition of prefix and exec_prefix lines in *-config from /usr to
$(STAGING_DIR)/usr.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Since commit d18692c libxml2 (and by extension libxslt) is linked against
iconv. Now icecast needs access to iconv as well. Without it the build fails.

xslt.c: In function 'xsltSaveResultToString':
xslt.c:72:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
     if (result->children == NULL)
     ^~
xslt.c:75:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
  buf = xmlAllocOutputBuffer(NULL);
  ^~~
xslt.c:81:27: error: dereferencing pointer to incomplete type 'xmlBuf' {aka 'struct _xmlBuf'}
   *doc_txt_len = buf->conv->use;
                           ^~
make[6]: *** [Makefile:545: xslt.o] Error 1
make[6]: Leaving directory '/openwrt/build_dir/target-mips_24kc_musl/icecast-2.4.4/src'

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

Since commit d18692c libxml2 is linked against iconv. Now ices needs
access to iconv as well. Without it the build fails.

checking for ftime... yes
checking for XML configuration
checking for xml2-config... /builder/shared-workdir/build/sdk/staging_dir/target-aarch64_generic_musl/host/bin/xml2-config
checking for xmlParseFile... no
configure: error: Unable to link with libxml

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Updated live555 to 2020.11.29.

Backported upstream patch to fix compilation.

Fixed up LIVE555 CFLAGS to avoid passing twice.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Same fix as in imagemagick.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Fixes two CVEs relating to UPnP.

Removed libuuid dependency. It is not used.

Remove clock_gettime hack. It seems to have been fixed.

Removed upstream patches.

Refreshed the other ones.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Remove several unneeded configure hacks.

Replace the POPT ones with more sensible ones.

Refresh patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

gst1-plugins-base might be required only for its libraries, not modules.
However, InstallDev tries to copy them unconditionally, failing when
no modules are selected/compiled.

Fixes #13973

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Signed-off-by: W. Michael Petullo <mike@flyn.org>

Dependencies are available now.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

These options are normally set to auto. Make them explicit to try to
fix buildbot errors.

Also make several options conditional on plugins being selected.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Remove upstreamed patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

It does not work with GCC10.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

The buildbots are unable to build this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

These plugins were disabled in commit e35d46b. Add them back. The
required libs are added, too.

Closes #13545

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>