[EGIT] [apps/terminology] master 01/01: circleci: typo
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=280b8c143f93cbb01b11bcce2a8ddff7805be392 commit 280b8c143f93cbb01b11bcce2a8ddff7805be392 Author: Boris Faure Date: Sun Sep 19 22:13:34 2021 +0200 circleci: typo --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ae3b8a..e3d9c39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: name: Compile with GCC command: | cd /terminology -meson -Dnls=false. build +meson -Dnls=false . build meson configure build cd build ninja -j4 --
[EGIT] [apps/terminology] master 01/02: circleci: do not compile with nls on alpine
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=0d0c98364d2111fea23628682d2d1ddf6320f681 commit 0d0c98364d2111fea23628682d2d1ddf6320f681 Author: Boris Faure Date: Sun Sep 19 22:04:49 2021 +0200 circleci: do not compile with nls on alpine --- .circleci/config.yml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db2085b..6ae3b8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: name: Compile with GCC command: | cd /terminology -meson . build +meson -Dnls=false. build meson configure build cd build ninja -j4 @@ -54,7 +54,7 @@ jobs: name: Compile with GCC command: | cd /terminology -meson . build +meson -Dnls=false . build meson configure build cd build ninja -j4 @@ -71,7 +71,7 @@ jobs: name: Compile with GCC command: | cd /terminology -meson . build +meson -Dnls=false . build meson configure build cd build ninja -j4 @@ -93,7 +93,7 @@ jobs: CFLAGS: -O0 -g command: | cd /terminology -meson -Dtests=true -Dfuzzing=true -Db_coverage=true -Dbuildtype=debug . build +meson -Dnls=false -Dtests=true -Dfuzzing=true -Db_coverage=true -Dbuildtype=debug . build meson configure build cd build ninja -j4 @@ -132,7 +132,7 @@ jobs: CFLAGS: -O0 -g command: | cd /terminology -meson -Dtests=true -Dbuildtype=release . build +meson -Dnls=false -Dtests=true -Dbuildtype=release . build meson configure build cd build ninja -j4 @@ -158,7 +158,7 @@ jobs: name: Compile with Clang command: | cd /terminology -meson -Dtests=true -Dfuzzing=true . build +meson -Dnls=false -Dtests=true -Dfuzzing=true . build meson configure build cd build ninja -j4 @@ -178,7 +178,7 @@ jobs: name: Compile with Clang command: | cd /terminology -meson -Dtests=true . build +meson -Dnls=false -Dtests=true . build meson configure build cd build ninja -j4 --
[EGIT] [apps/terminology] master 02/02: meson: nls does require libintl
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=18ac38b8ce8e80e32fa3f42534def8152dbbd3a2
commit 18ac38b8ce8e80e32fa3f42534def8152dbbd3a2
Author: Boris Faure
Date: Sun Sep 19 22:07:00 2021 +0200
meson: nls does require libintl
---
meson.build | 2 +-
meson_options.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 4e30488..6a2502d 100644
--- a/meson.build
+++ b/meson.build
@@ -65,7 +65,7 @@ edj_files = []
if get_option('nls') == true
subdir('po')
- terminology_dependencies += dependency('intl', required: false)
+ terminology_dependencies += dependency('intl', required: true)
endif
foreach efl_dep: efl_deps
diff --git a/meson_options.txt b/meson_options.txt
index 9da74a2..be2b29d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,4 +15,4 @@ option('tests',
option('nls',
type: 'boolean',
value: true,
- description: 'enable localization: (default=true)')
+ description: 'enable localization. Requires libintl. (default=true)')
--
[EGIT] [apps/terminology] master 01/01: Switch to using explicit dependency func instead of using find_library
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=248387b8c7835326b9ddea83dd46a7969ad1
commit 248387b8c7835326b9ddea83dd46a7969ad1
Author: Joshua Strobl
Date: Sun Sep 19 21:35:23 2021 +0200
Switch to using explicit dependency func instead of using find_library
Summary: This fixes intl detection (under Solus, x86_64-solus-linux-gcc
(Solus) 11.2.0).
Test Plan:
1. Compiled terminology without patch, failed to find intl and would not
include gettext po files.
2. Compiled with patch, successfully found intl.
Tested against efl 1.25.1 with terminology 1.9.0. Meson release is 1.59.1.
Subscribers: EbonJaeger
Differential Revision: https://phab.enlightenment.org/D12291
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 12d3e91..4e30488 100644
--- a/meson.build
+++ b/meson.build
@@ -65,7 +65,7 @@ edj_files = []
if get_option('nls') == true
subdir('po')
- terminology_dependencies += cc.find_library('intl', required: false)
+ terminology_dependencies += dependency('intl', required: false)
endif
foreach efl_dep: efl_deps
--
[EGIT] [apps/rage] master 01/01: remove docs for -e - removed
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=fb32501827e19a580a0f44b23ce25412eae8d8ee commit fb32501827e19a580a0f44b23ce25412eae8d8ee Author: Carsten Haitzler (Rasterman) Date: Sun Sep 19 18:54:48 2021 +0100 remove docs for -e - removed --- README | 6 -- 1 file changed, 6 deletions(-) diff --git a/README b/README index d6205f2..3509a33 100644 --- a/README +++ b/README @@ -17,12 +17,6 @@ thumbnail and more. It accepts file lists on the cmdline ala: rage dvd:/ rage http://www.blah.com/stream -You can tell it what media/video engine in emotion to ue via -e: - - rage -e vlc blah.mov - rage -e xine dvd:/ - rage -e gstreamer1 blah.mp3 - You can also specify subtitle files with -sub: rage file.mp4 -sub mysubs.srt --
[EGIT] [legacy/imlib2] master 03/03: Test: Add some minimal regression testing
kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=8ac8041adf865525644125599a104f23a3dd286e commit 8ac8041adf865525644125599a104f23a3dd286e Author: Kim Woelders Date: Mon Nov 11 19:22:02 2019 +0100 Test: Add some minimal regression testing --- Makefile.am | 6 +- configure.ac| 5 +- test/.gitignore | 4 + test/Makefile.am| 53 test/images/icon-64.argb| 2 + test/images/icon-64.bmp | Bin 0 -> 12426 bytes test/images/icon-64.ff | Bin 0 -> 32784 bytes test/images/icon-64.ff.bz2 | Bin 0 -> 9050 bytes test/images/icon-64.ff.gz | Bin 0 -> 14295 bytes test/images/icon-64.gif | Bin 0 -> 4038 bytes test/images/icon-64.ico | Bin 0 -> 16958 bytes test/images/icon-64.ilbm| Bin 0 -> 12938 bytes test/images/icon-64.jpeg| Bin 0 -> 2454 bytes test/images/icon-64.jpg | Bin 0 -> 2454 bytes test/images/icon-64.jpg.mp3 | Bin 0 -> 137421 bytes test/images/icon-64.png | Bin 0 -> 6179 bytes test/images/icon-64.ppm | 4 + test/images/icon-64.tga | Bin 0 -> 12306 bytes test/images/icon-64.tiff| Bin 0 -> 6212 bytes test/images/icon-64.webp| Bin 0 -> 784 bytes test/images/icon-64.xbm | 46 +++ test/images/icon-64.xpm | 296 test/test_file.cpp | 193 + test/test_load.cpp | 174 ++ test/test_save.cpp | 154 +++ 25 files changed, 935 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 40eec91..666d516 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,11 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src data doc +if BUILD_TEST +SUBDIRS_TEST = test +endif + +SUBDIRS = src data doc $(SUBDIRS_TEST) CLEANFILES = $(PACKAGE).spec diff --git a/configure.ac b/configure.ac index 58972ec..8c8b0b1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(1.6 dist-xz) +AM_INIT_AUTOMAKE(1.6 dist-xz -Wno-portability) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git) @@ -12,6 +12,7 @@ AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git) AC_C_BIGENDIAN AC_PROG_CC AM_PROG_AS +AC_PROG_CXX AC_C_CONST @@ -388,6 +389,7 @@ else fi AM_CONDITIONAL(BUILD_ID3_LOADER, test "$id3_ok" = yes) +AM_CONDITIONAL(BUILD_TEST, false) EC_C_WARNINGS() EC_C_VISIBILITY(yes) @@ -407,6 +409,7 @@ data/Makefile data/fonts/Makefile data/images/Makefile doc/Makefile +test/Makefile README ]) AC_OUTPUT diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 000..375cb30 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1,4 @@ +/*.d +/images/empty.* +/images/nonex.* +/images/icon-64.*.* diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 000..f804f39 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,53 @@ +# Unit test makefile +# +noinst_PROGRAMS = $(GTESTS) + + GTEST_LIBS = -lgtest -lstdc++ + + GTESTS = test_file + GTESTS += test_load + GTESTS += test_save + + AM_CFLAGS = -Wall -Wextra -Werror -Wno-unused-parameter + AM_CFLAGS += $(CFLAGS_ASAN) + + AM_CXXFLAGS = $(AM_CFLAGS) + + AM_CPPFLAGS = -I $(top_builddir) -I $(top_srcdir)/src/lib + AM_CPPFLAGS += -D SRC_DIR='"$(top_srcdir)"' + AM_CPPFLAGS += -D BUILD_TEST=1 + +# Must have proper -lImlib2 on all progs + LIBS = -L$(top_builddir)/src/lib -lImlib2 + LIBS += $(GTEST_LIBS) + +vpath %.c $(top_srcdir)/src/lib + +test_file_SOURCES = test_file.cpp file.c +test_file_LDADD = $(LIBS) + +test_load_SOURCES = test_load.cpp +test_load_LDADD = $(LIBS) + +test_save_SOURCES = test_save.cpp +test_save_LDADD = $(LIBS) + + TESTS_RUN = $(addprefix run-, $(GTESTS)) + + TEST_ENV = IMLIB2_LOADER_PATH=$(top_builddir)/src/modules/loaders/.libs + + VG_PROG = valgrind --leak-check=full + +all-local: run + +.PHONY: run $(TESTS_RUN) +run: $(TESTS_RUN) +$(TESTS_RUN): run-%: % + $(TEST_ENV) ./$* $(RUN_OPTS) + + TESTS_RUN_VG = $(addprefix run-vg-, $(GTESTS)) + +.PHONY: run-vg $(TESTS_RUN_VG) +run-vg: $(TESTS_RUN_VG) +$(TESTS_RUN_VG): run-vg-%: % + $(TEST_ENV) $(VG_PROG) ./$* $(RUN_OPTS) diff --git a/test/images/icon-64.argb b/test/images/icon-64.argb new file mode 100644 index 000..6d87c8c --- /dev/null +++ b/test/images/icon-64.argb @@ -0,0 +1,2 @@ +ARGB 64 64 0 +^n�tPb�tPb�sPa�sOa�qN_��~��yRd�b0G�i5M�k6O�h4M�f4M�b3K�`3J�`2I�^0G�[,D�W(@�R";�L
[EGIT] [legacy/imlib2] master 01/03: Build .xz instead of .bz2 release tarball
kwo pushed a commit to branch master. http://git.enlightenment.org/legacy/imlib2.git/commit/?id=7808f3475061297ab7075f208cedb26cd4bef8e1 commit 7808f3475061297ab7075f208cedb26cd4bef8e1 Author: Kim Woelders Date: Fri Sep 17 17:53:36 2021 +0200 Build .xz instead of .bz2 release tarball Somewhat smaller (~16%), faster decompression. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac6..5ee9fca 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(1.6 dist-bzip2) +AM_INIT_AUTOMAKE(1.6 dist-xz) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONDITIONAL(SRC_IS_GIT, test -d $srcdir/.git) --
[EGIT] [legacy/imlib2] master 02/03: Drop imlib2-config (use pkg-config)
kwo pushed a commit to branch master.
http://git.enlightenment.org/legacy/imlib2.git/commit/?id=e9d84bd2163e6fab494b5ce5cc8830a54ff97765
commit e9d84bd2163e6fab494b5ce5cc8830a54ff97765
Author: Kim Woelders
Date: Wed Oct 22 18:36:39 2008 +
Drop imlib2-config (use pkg-config)
---
.gitignore | 1 -
Makefile.am | 2 --
configure.ac | 4
doc/index.html | 2 +-
imlib2-config.in | 59
imlib2.c.in | 4 ++--
imlib2.spec.in | 1 -
7 files changed, 3 insertions(+), 70 deletions(-)
diff --git a/.gitignore b/.gitignore
index 17c41de..1d3fa38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
/stamp-h1
/m4/*.m4
-/imlib2-config
/imlib2.pc
/imlib2.spec
/README
diff --git a/Makefile.am b/Makefile.am
index 47b2c0e..40eec91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,6 @@ MAINTAINERCLEANFILES = aclocal.m4 compile \
depcomp install-sh ltmain.sh missing Makefile.in \
imlib2_docs.tar.gz
-bin_SCRIPTS = imlib2-config
-
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
Doxyfile \
README.in README \
diff --git a/configure.ac b/configure.ac
index 5ee9fca..58972ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -407,12 +407,8 @@ data/Makefile
data/fonts/Makefile
data/images/Makefile
doc/Makefile
-imlib2-config
README
])
-AC_CONFIG_COMMANDS([default],[
-chmod +x imlib2-config
-],[])
AC_OUTPUT
#
diff --git a/doc/index.html b/doc/index.html
index fb1a789..649baf2 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
}
Now to compile this
-cc imlib2_convert.c -o imlib2_convert `imlib2-config
--cflags` `imlib2-config --libs`
+cc imlib2_convert.c -o imlib2_convert `pkg-config
--cflags --libs imlib2`
You now have a program that if used as follows:
diff --git a/imlib2-config.in b/imlib2-config.in
deleted file mode 100644
index 965f7c3..000
--- a/imlib2-config.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage="\
-Usage: imlib2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]
[--libs] [--cflags]"
-
-if test $# -eq 0; then
- echo "${usage}" 1>&2
- exit 1
-fi
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
---prefix=*)
- prefix=$optarg
- if test $exec_prefix_set = no ; then
-exec_prefix=$optarg
- fi
- ;;
---prefix)
- echo $prefix
- ;;
---exec-prefix=*)
- exec_prefix=$optarg
- exec_prefix_set=yes
- ;;
---exec-prefix)
- echo $exec_prefix
- ;;
---version)
- echo @VERSION@
- ;;
---cflags)
- if test @prefix@/include != /usr/include ; then
-includes="-I@prefix@/include"
- fi
- echo $includes
- ;;
---libs)
- libdirs=-L@libdir@
- echo $libdirs -lImlib2
- ;;
-*)
- echo "${usage}" 1>&2
- exit 1
- ;;
- esac
- shift
-done
-
-exit 0
diff --git a/imlib2.c.in b/imlib2.c.in
index 12bafbd..3f4c2ea 100644
--- a/imlib2.c.in
+++ b/imlib2.c.in
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
Now to compile this
@verbatim
-cc imlib2_convert.c -o imlib2_convert `imlib2-config --cflags` `imlib2-config
--libs`
+cc imlib2_convert.c -o imlib2_convert `pkg-config --cflags --libs imlib2`
@endverbatim
You now have a program that if used as follows:
@@ -544,4 +544,4 @@ return type - Imlib_Image, this is the result of filter.
@todo filled polygons can break fill bounds on corner cases - fix
@todo go thru TODOs and FIXMEs
-*/
\ No newline at end of file
+*/
diff --git a/imlib2.spec.in b/imlib2.spec.in
index 98f26a5..4e5e1bc 100644
--- a/imlib2.spec.in
+++ b/imlib2.spec.in
@@ -43,7 +43,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/libImlib2.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/filters/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/loaders/*.la
-rm -f $RPM_BUILD_ROOT%{_bindir}/imlib2-config
%clean
rm -rf $RPM_BUILD_ROOT
--
