Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5b4ac4c
lv-tool: Add lv-tool.cpp code off the master branch
hartwork Dec 4, 2022
9be435f
lv-tool: Resolve use of version.h
hartwork Jan 7, 2023
46e583a
lv-tool: Drop --morph code
hartwork Jan 6, 2023
3309a1b
lv-tool: Drop --driver code
hartwork Jan 6, 2023
a7b99b6
lv-tool: Backport LV::System::init and ::quit to 0.4.x
hartwork Jan 6, 2023
4250aa6
lv-tool: Backport --plugin-help to 0.4.x
hartwork Jan 7, 2023
93c0d5d
lv-tool: Backport --verbose to 0.4.x
hartwork Jan 6, 2023
7c82834
lv-tool: Backport setting random seed to 0.4.x
hartwork Jan 6, 2023
8580627
lv-tool: Backport actor calls to 0.4.x
hartwork Jan 6, 2023
0edca6f
lv-tool: Backport SDL 1.x display and events handling to 0.4.x
hartwork Jan 7, 2023
2b167e1
lv-tool: Backport call to visual_video_depth_from_bpp to 0.4.x
hartwork Jan 7, 2023
39db538
lv-tool: Backport use of VISUAL_USECS_PER_SEC to 0.4.x
hartwork Jan 6, 2023
176791b
lv-tool: Implement LV::Bin wrap layer for 0.4.x
hartwork Jan 14, 2023
31b304a
lv-tool: Implement LV::Time for 0.4.x
hartwork Jan 7, 2023
3a221d8
lv-tool: Upgrade default actor plugin to "lv_gltest" if available
hartwork Dec 30, 2022
863e701
lv-tool: Switch default FPS limit from 30 to 60
hartwork Jan 7, 2023
262d80c
lv-tool: Address stack-use-after-scope issue
hartwork Jan 7, 2023
a1d9861
lv-tool: Sync attribution header
hartwork Jan 7, 2023
bbc79c3
lv-tool: Integrate with the build system
hartwork Dec 4, 2022
73ae3f2
lv-tool: Enable translation
hartwork Jan 7, 2023
304cc46
libvisual: configure.ac: Sync PACKAGE_BUGREPORT, set PACKAGE_URL
hartwork Jan 7, 2023
2c75fe0
Plugins: configure.ac: Sync PACKAGE_BUGREPORT, set PACKAGE_URL
hartwork Jan 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libvisual-plugins/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ m4_define([lv_plugins_version_micro], [1])
m4_define([lv_plugins_version], [lv_plugins_version_major.lv_plugins_version_minor.lv_plugins_version_micro])
m4_define([lv_plugins_version_suffix], [lv_plugins_version_major.lv_plugins_version_minor])

AC_INIT(Libvisual plugins, lv_plugins_version, ds@nerds-incorporated.org)
AC_INIT([Libvisual plugins], [lv_plugins_version], [https://github.com/Libvisual/libvisual/issues], [libvisual-plugins], [https://github.com/Libvisual/libvisual])
AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])

AC_CONFIG_SRCDIR([config.h.in])
Expand Down
2 changes: 1 addition & 1 deletion libvisual/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Process this file with automake to generate a Makefile.in

SUBDIRS = libvisual po examples
SUBDIRS = libvisual po examples tools/lv-tool

PKG_CONFIG_FILE = libvisual-$(LIBVISUAL_VERSION_SUFFIX).pc

Expand Down
35 changes: 28 additions & 7 deletions libvisual/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ m4_define([libvisual_version_micro], [1])

m4_define([libvisual_version], [libvisual_version_major.libvisual_version_minor.libvisual_version_micro])

AC_INIT([Libvisual Library], [libvisual_version], [synap@nerds-incorporated.org], [libvisual])
AC_INIT([Libvisual Library], [libvisual_version], [https://github.com/Libvisual/libvisual/issues], [libvisual], [https://github.com/Libvisual/libvisual])
AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])

dnl TODO: Add these into lv_config.h (or maybe lv_version.h)
Expand Down Expand Up @@ -374,6 +374,18 @@ AC_SUBST(VISUAL_LIBS)
dnl ******************************
dnl Arguments to specify certain features.
dnl ******************************
AC_ARG_ENABLE([lv-tool],
AC_HELP_STRING([--disable-lv-tool],
[Do not build lv-tool @<:@default=enabled@:>@]),
[lv_tool_enabled=$enableval],
[lv_tool_enabled=yes])
AC_MSG_CHECKING([wheter to build tool programs])
if test x$lv_tool_enabled = xyes ; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi

AC_ARG_ENABLE([examples],
AC_HELP_STRING([--disable-examples],
[Do not build example programs @<:@default=enabled@:>@]),
Expand All @@ -382,19 +394,27 @@ AC_ARG_ENABLE([examples],
AC_MSG_CHECKING([wheter to build example programs])
if test x$examples = xyes ; then
AC_MSG_RESULT([yes])
# Find SDL to build the examples.
else
AC_MSG_RESULT([no])
fi

if test x$lv_tool_enabled = xyes -o x$examples = xyes ; then
# Find SDL 1.x.x
AC_PATH_TOOL(SDL_CONFIG, [sdl-config])
if test x$SDL_CONFIG = x ; then
AC_MSG_ERROR([*** sdl-config not found.
If you have installed from binaries, probably you have not
installed SDL development package.
See http://www.libsdl.org])
installed SDL 1.x.x development package.
See https://www.libsdl.org/])
fi
# On success, this will set and substitute SDL_CFLAGS and SDL_LIBS
AM_PATH_SDL(1.2.0,,AC_MSG_ERROR([*** SDL >= 1.2.0 not installed - please install first]))
AC_SUBST([EXAMPLES], ['simplesdl morphsdl'])
else
AC_MSG_RESULT([no])
if test x$examples = xyes ; then
AC_SUBST([EXAMPLES], ['simplesdl morphsdl'])
fi
if test x$lv_tool_enabled = xyes ; then
AC_SUBST([TOOLS_LV_TOOL], ['lv-tool'])
fi
fi

dnl ******************************
Expand Down Expand Up @@ -846,6 +866,7 @@ Makefile
libvisual.pc
libvisual/Makefile
examples/Makefile
tools/lv-tool/Makefile
])
#
# For now this are not included in the package
Expand Down
1 change: 1 addition & 0 deletions libvisual/po/POTFILES.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ libvisual/lv_plugin.c
libvisual/lv_thread.c
libvisual/lv_transform.c
libvisual/lv_video.c
tools/lv-tool/lv-tool.cpp
6 changes: 5 additions & 1 deletion libvisual/po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libvisual 0.4.0-2.2\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2006-03-21 02:43+0800\n"
"POT-Creation-Date: 2023-01-15 01:44+0100\n"
"PO-Revision-Date: 2017-08-10 18:46+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
Expand Down Expand Up @@ -900,5 +900,9 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Ungültige Tiefe an Scaler übergeben"

#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840
msgid "lv-tool"
msgstr ""

#~ msgid " bytes of memory"
#~ msgstr " Bytes des Speichers"
6 changes: 5 additions & 1 deletion libvisual/po/es_AR.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Libvisual Library 0.4.0\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2006-03-21 02:43+0800\n"
"POT-Creation-Date: 2023-01-15 01:44+0100\n"
"PO-Revision-Date: 2005-03-20 17:09-0300\n"
"Last-Translator: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -918,6 +918,10 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Profundidad pasada al escalador inválida"

#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840
msgid "lv-tool"
msgstr ""

#~ msgid " bytes of memory"
#~ msgstr " bytes de memoria"

Expand Down
6 changes: 5 additions & 1 deletion libvisual/po/es_ES.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Libvisual Library 0.4.0\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2006-03-21 02:43+0800\n"
"POT-Creation-Date: 2023-01-15 01:44+0100\n"
"PO-Revision-Date: 2005-03-20 17:09-0300\n"
"Last-Translator: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -918,6 +918,10 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Profundidad pasada al escalador inválida"

#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840
msgid "lv-tool"
msgstr ""

#~ msgid " bytes of memory"
#~ msgstr " bytes de memoria"

Expand Down
6 changes: 5 additions & 1 deletion libvisual/po/libvisual-0.4.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libvisual 0.4.1\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2006-03-21 02:43+0800\n"
"POT-Creation-Date: 2023-01-15 01:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -870,3 +870,7 @@ msgstr ""
#: libvisual/lv_video.c:2775 libvisual/lv_video.c:2922
msgid "Invalid depth passed to the scaler"
msgstr ""

#: tools/lv-tool/lv-tool.cpp:743 tools/lv-tool/lv-tool.cpp:840
msgid "lv-tool"
msgstr ""
9 changes: 9 additions & 0 deletions libvisual/tools/lv-tool/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
## Process this file with automake to generate a Makefile.in

bin_PROGRAMS = $(TOOLS_LV_TOOL)

EXTRA_PROGRAMS = lv-tool

lv_tool_SOURCES = lv-tool.cpp
lv_tool_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libvisual
lv_tool_LDADD = $(SDL_LIBS) ../../libvisual/libvisual-@LIBVISUAL_VERSION_SUFFIX@.la
Loading