summaryrefslogtreecommitdiffstats
path: root/package/mplayer
Commit message (Collapse)AuthorAgeFilesLines
* package/mplayer: needs BR2_TOOLCHAIN_HAS_SYNC_4Bernd Kuhls2016-07-041-0/+2
| | | | | | | | | | | | | | | | | Even though mplayer bundles the ffmpeg code base (and ffmpeg is not affected by this issue), mplayer uses its own build system and doesn't test properly for the availability (or not) of atomic operations. In order to keep things simple, we simply make mplayer depend on the availability of atomic operations, since it assumes they are available. The reverse dependency is propagated to libplayer and tovid. Fixes: http://autobuild.buildroot.net/results/6306757da3be9bb7e3cdcbfc8abb4e64a3fb7913/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: Fix static linking with tremor & liboggBernd Kuhls2016-07-041-0/+29
| | | | | | | | Fixes http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: adjust configure options to updated libdvdread/libdvdnavBernd Kuhls2016-06-191-2/+2
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* mplayer: not available on m68kPeter Korsgaard2016-06-151-1/+1
| | | | | | | | | | | | | | Fixes: http://autobuild.buildroot.org/results/e48/e48db9dc487547f4d6f6102b4bd2512e0281018a/ http://autobuild.buildroot.org/results/cfc/cfc6ad13c7b4fb080ee89ba4acb420ebb38373ea/ From the log: The architecture of your CPU (m68k) is not supported by this configure script It seems nobody has ported MPlayer to your OS or CPU type yet. Error: unsupported architecture m68k Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/mplayer: add optional support for mpg123Bernd Kuhls2016-06-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mplayer has optional support for mpg123, to get reproducable builds add mpg123 as optional dependency. Linked libraries without this patch: $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/mplayer | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.1] 0x0000000000000001 (NEEDED) Shared library: [libm.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.1] Linked libraries after this patch: $ output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/mplayer | grep NEEDED 0x0000000000000001 (NEEDED) Shared library: [librt.so.1] 0x0000000000000001 (NEEDED) Shared library: [libmpg123.so.0] 0x0000000000000001 (NEEDED) Shared library: [libpthread.so.1] 0x0000000000000001 (NEEDED) Shared library: [libdl.so.1] 0x0000000000000001 (NEEDED) Shared library: [libm.so.1] 0x0000000000000001 (NEEDED) Shared library: [libc.so.1] Like with many other optional libraries detection of mpg123 is broken if --enable-mpg123 is passed to configure leading to a build error: libmpcodecs/ad_mpg123.o: In function `set_format': ad_mpg123.c:(.text+0x63): undefined reference to `mpg123_getformat' libmpcodecs/ad_mpg123.o: In function `decode_a_bit': ad_mpg123.c:(.text+0x1b6): undefined reference to `mpg123_feed' ad_mpg123.c:(.text+0x20e): undefined reference to `mpg123_replace_buffer' ad_mpg123.c:(.text+0x223): undefined reference to `mpg123_decode_frame_64' ad_mpg123.c:(.text+0x275): undefined reference to `mpg123_strerror' [...] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Merge branch 'next'Peter Korsgaard2016-06-013-5/+35
|\ | | | | | | Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| * package/mplayer: bump version to 1.3.0Bernd Kuhls2016-05-283-5/+35
| | | | | | | | | | | | | | Added upstream commit to fix compilation when zlib is missing. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* | package/mplayer: fix aarch64 compilationBernd Kuhls2016-05-282-0/+47
| | | | | | | | | | | | | | | | | | | | Added code to define HAVE_ARMV8 when needed. Fixes http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* | package/mplayer: add x86-specific configure optionsBernd Kuhls2016-05-281-2/+54
|/ | | | | | | | | | | | | | | | | | | | | | | | | | The mplayer configure script tries to detect the capabilities of the CPU used by probing the host CPU. This leads to compilation failures if the target CPU has lesser features, like missing mmx support for BR2_x86_i686=y: Checking for CPU vendor ... GenuineIntel (6:58:9) Checking for CPU type ... Intel(R) Core(TM) i7-3770S CPU @ 3.10GHz Checking for kernel support of sse ... yes Checking for kernel support of sse2 ... yes Checking for kernel support of sse3 ... yes Checking for kernel support of ssse3 ... yes Checking for kernel support of sse4_1 ... yes Checking for kernel support of sse4_2 ... yes Checking for kernel support of avx ... yes For this patch I copied most of ffmpeg configure options for x86 CPUs because mplayer contains its own copy of ffmpeg. Fixes http://autobuild.buildroot.net/results/c5a/c5a722607ec9797c317b63b0fd3235608a340c98/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: switch it to samba4Gustavo Zacarias2016-03-151-2/+4
| | | | | | | | | | samba(3) has been deprecated for quite some time so switch mplayer to use samba4 if available. It needs a little extra tweak to pick up the proper cflags since the odd configure script doesn't do it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package/mplayer: add optional dependencies to libgl, libvpx and opusBernd Kuhls2016-03-081-0/+3
| | | | | | | | | | | | Mplayer links to these packages when present: output/host/usr/bin/x86_64-linux-readelf -a output/target/usr/bin/mplayer | grep NEEDED | grep "opus\|vpx\|GL" 0x0000000000000001 (NEEDED) Shared library: [libopus.so.0] 0x0000000000000001 (NEEDED) Shared library: [libvpx.so.2] 0x0000000000000001 (NEEDED) Shared library: [libGL.so.1] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: use autodetection for dvdnavVicente Olivert Riera2015-12-151-1/+2
| | | | | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: Needs threadsBernd Kuhls2015-12-131-0/+5
| | | | | | | | | | | | Fixes http://autobuild.buildroot.net/results/fc0/fc02e01514965e13ee1de8f520a5b45f63a1103e/ http://autobuild.buildroot.net/results/b9c/b9cb712b321de4528d1a8dfb9bdfb16190bb660a/ http://autobuild.buildroot.net/results/22a/22aa0367ff76a3024faec69c762a08a4a441f45f/ and others Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: Fix linking with libvorbis/libdvdreadBernd Kuhls2015-11-181-2/+4
| | | | | | | | | | | | | Fixes http://autobuild.buildroot.net/results/7f6/7f6e5396e95a3c3b676ca59bedc5317aa88e5f4c/ http://autobuild.buildroot.net/results/6ac/6acd9cf25c3088d313247510db47a214fff30c67/ http://autobuild.buildroot.net/results/a0d/a0da41bb734dbcdb17e13d852cfbdba5e069429e/ http://autobuild.buildroot.net/results/d0c/d0caf60c1ddf4e05086c93f646e32b5ddc75b6ce/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: needs host-yasm for mmx supportBernd Kuhls2015-11-111-1/+7
| | | | | | | | | | | Fixes http://autobuild.buildroot.net/results/6a8/6a8c3a70e33cb5b3fc40d036fb0716d915185f33/ http://autobuild.buildroot.net/results/cef/cef30d4e14d39ab64bb27a6514a0390755f4a9d2/ http://autobuild.buildroot.net/results/03b/03b1b42688b07789971a99337708b4dbe4278665/ http://autobuild.buildroot.net/results/5e3/5e3320dfc6793a9ff0494161cdc9a3be795462c4/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: enable apng and tdsc only if zlib is availableVicente Olivert Riera2015-10-151-0/+13
| | | | | | | | | | | | | | | | | apng and tdsc are enabled by default, but they need zlib, otherwise the compilation will fail with an error like this one: libavcodec/pngdec.c:35:18: fatal error: zlib.h: No such file or directory #include <zlib.h> ^ compilation terminated. So add an autodep on BR2_PACKAGE_ZLIB to enable or disable support for apng and tdsc accordingly. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: add license infoGustavo Zacarias2015-10-081-3/+3
| | | | | | | | | | | Most code is GPLv2+ or compatible except for one file that is GPLv2-only, hence as a whole is GPLv2 (see Copyright). Also kill some whitespace and make the only hard dependency (host-pkgconf) a hard dependency, not an addition, since it's not conditional. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* mplayer: bump to version 1.2Vicente Olivert Riera2015-10-079-387/+16
| | | | | | | | | | | | | | | | | | | | | | | - Bump to version 1.2 - Update hash file. - Remove no longer existent configure options: --disable-dvdread-internal, --disable-tremor-internal. - Tweak 0001-disable-install-strip.patch. - Remove 0002-fix-cc-parsing.patch. Upstreamed: https://github.com/pigoz/mplayer-svn/commit/0f3ddfe146b8b2c6fe9302017375ef6b30ffbe71 - Remove 0004-add-arc-support.patch. Upstreamed: https://github.com/pigoz/mplayer-svn/commit/3b8c5f22313a416b24dcc4e7facde0a886352a75 - Remove 0005-Support-newer-GIFLIB-versions.patch. Upstreamed: https://github.com/pigoz/mplayer-svn/commit/a0ddaef5457e222dade386901bf448c5e3ac7b89 - Remove 0006-Support-newer-GIFLIB-versions-part2.patch. Upstreamed: https://github.com/pigoz/mplayer-svn/commit/a43d259602723d92db1463b166739fb8d22c2d51 - Remove 0007-mplayer-enable-aarch64.patch. Upstreamed: https://github.com/pigoz/mplayer-svn/commit/1cceebf1fa0cc1b27429e937f1cfa61c406f9159 - Rename 0003-mpdemux-live555-async-interface.patch to 0002-mpdemux-live555-async-interface.patch. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* mplayer: enable building on ARM64jpinto2015-09-172-1/+23
| | | | | Signed-off-by: Joao Pinto <jpinto@synopsys.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: add hash fileGustavo Zacarias2015-07-161-0/+4
| | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
* package/mplayer: Add additional X11 dependenciesBernd Kuhls2015-07-111-0/+3
| | | | | | | Proposed fix for https://bugs.busybox.net/show_bug.cgi?id=8206 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove non-IPv6 dependencies and tweaksGustavo Zacarias2015-04-221-13/+1
| | | | | | | | Now that IPv6 is mandatory remove package dependencies and conditionals for it. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libmpeg2 supportBernd Kuhls2015-04-081-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional lame supportBernd Kuhls2015-04-081-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional bzip2 supportBernd Kuhls2015-04-081-0/+1
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: disable optional libcdio supportBernd Kuhls2015-04-081-0/+5
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libiconv supportBernd Kuhls2015-04-081-0/+8
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional speex supportBernd Kuhls2015-04-081-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional rtmpdump supportBernd Kuhls2015-04-081-0/+8
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional faad2 supportBernd Kuhls2015-04-081-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional lzo supportBernd Kuhls2015-04-081-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libenca supportBernd Kuhls2015-04-071-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libass supportBernd Kuhls2015-04-071-0/+6
| | | | | | | [Thomas: rely on autodetection.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libfribidi supportBernd Kuhls2015-04-071-0/+8
| | | | | | | [Thomas: rely on autodetection.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional fontconfig supportBernd Kuhls2015-04-071-0/+8
| | | | | | | [Thomas: rely on autodetection.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional libbluray supportBernd Kuhls2015-04-071-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional samba supportBernd Kuhls2015-04-071-0/+7
| | | | | Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional ncurses supportBernd Kuhls2015-04-071-0/+9
| | | | | | | | [Thomas: don't pass --enable-termcap, and rely on autodetection instead of forcing -lncurses.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: introduce a BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS optionThomas Petazzoni2015-04-051-2/+7
| | | | | | | | In order to allow other packages to easily select mplayer without duplicating its complicated architecture dependencies, this commit introduces a BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS blind option. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove (non-)lfs dependencies and tweaksGustavo Zacarias2015-04-011-7/+0
| | | | | | | | Now that largefile is mandatory removes package dependencies and conditionals. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: add optional giflib supportBernd Kuhls2015-03-301-0/+7
| | | | | | | | [Thomas: Use --enable-gif / --disable-gif, and do not pass --extra-libs.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/mplayer: needs host-pkgconfBernd Kuhls2015-03-301-0/+2
| | | | | | | | | | mplayer's custom configure script can use pkg-config to discover dependencies. [Thomas: improve commit log.] Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: fix compilation with new versions of libgifVicente Olivert Riera2015-02-142-0/+312
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mplayer fails to compile with the following error message: libmpdemux/demux_gif.c: In function 'demux_open_gif': libmpdemux/demux_gif.c:260:3: error: too few arguments to function 'DGifOpen' gif = DGifOpen(demuxer->stream, my_read_gif); Backport an upstream patch to support newer versions of libgif in mplayer. Unfortunately this patch is incomplete and mplayer stills failing to compile with a new error message: libvo/vo_gif89a.c: In function 'uninit': libvo/vo_gif89a.c:374:3: error: too few arguments to function 'EGifCloseFile' EGifCloseFile(new_gif); // also frees gif storage space. So I have written a new patch and submitted it upstream to finally fix the problem. Upstream commit: https://github.com/pigoz/mplayer-svn/commit/a0ddaef5457e222dade386901bf448c5e3ac7b89 New submitted patch: https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2015-February/072848.html Fixes: http://autobuild.buildroot.net/results/a51/a510a0ab2cb827bb91b4fdec43055f2bfda239b1/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* package/*: rename patches according to the new policyPeter Korsgaard2015-02-034-0/+0
| | | | | | | Autogenerated from rename-patch.py (http://patchwork.ozlabs.org/patch/403345) Signed-off-by: Samuel Martin <s.martin49@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* live555: use upstream install target for staging installationBaruch Siach2014-11-181-1/+1
| | | | | | | | | Move include directories out of $(STAGING_DIR)/usr/include/live. This is upstream choice, and is consistent with e.g. Debian. Update mplayer and vlc to match. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* mplayer: also hide toolchain comment on ARMv4Peter Korsgaard2014-11-061-0/+1
| | | | | | Like we do for the other arch dependencies. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* mplayer: allow usage of ARMv6 optimizations on ARMv7 platformsPeter Korsgaard2014-11-061-1/+1
| | | | | | Similar to what we do for ffmpeg/gst-ffmpeg/gst1-libav. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* mplayer: use BR2_ARM_CPU_ARM* optionsThomas Petazzoni2014-11-062-4/+3
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* package: indentation cleanupJerzy Grzegorek2014-11-021-2/+2
| | | | | Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* .mk files: bulk aligment and whitespace cleanup of assignmentsThomas De Schampheleire2014-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
OpenPOWER on IntegriCloud