Skip to content

Commit a365ec2

Browse files
descenderhartwork
descender
authored and
hartwork
committed
* configure.ac: Bump version to 0.4.0.
* plugins/*: Merge build fixes from HEAD. * po/*.po: Merge from HEAD.
1 parent 2aa3a10 commit a365ec2

File tree

9 files changed

+23
-66
lines changed

9 files changed

+23
-66
lines changed

‎libvisual-plugins/ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2006-03-08 Chong Kai Xiong <[email protected]>
2+
3+
* plugins/actor/pseudotoad_flower/Makefile.am: Add missing \,
4+
fixes pseudo_toad plugin build.
5+
6+
2006-03-08 Chong Kai Xiong <[email protected]>
7+
8+
* plugins/actor/G-Force/*: Fix G-Force plugin build. Don't use '+='
9+
for LIBS, link all internal libraries statically, rename
10+
internal actor_plugin.la to libactor_plugin.la.
11+
112
2006-03-03 Dennis Smit <[email protected]>
213

314
* po/POTFILES.in: removed dna, goom2 interface (since we now include

‎libvisual-plugins/configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
AC_PREREQ(2.57)
44

55
m4_define([lv_plugins_version_major], [0])
6-
m4_define([lv_plugins_version_minor], [3])
6+
m4_define([lv_plugins_version_minor], [4])
77
m4_define([lv_plugins_version_micro], [0])
88
m4_define([lv_plugins_version], [lv_plugins_version_major.lv_plugins_version_minor.lv_plugins_version_micro])
99
m4_define([lv_plugins_version_suffix], [lv_plugins_version_major.lv_plugins_version_minor])
@@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE([1.7.0 dist-bzip2])
1414
AC_CONFIG_SRCDIR([config.h.in])
1515
AC_CONFIG_HEADER([config.h])
1616

17-
m4_define([libvisual_required_version], [0.3.0])
17+
m4_define([libvisual_required_version], [lv_plugins_version])
1818
m4_define([esound_required_version], [0.2.28])
1919
m4_define([jack_required_version], [0.98.0])
2020
m4_define([gtk_required_version], [2.0])

‎libvisual-plugins/plugins/actor/G-Force/Common/math/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ INCLUDES = \
1515

1616
ALLSOURCES = ExprArray.cpp ExprVirtualMachine.cpp Expression.cpp ExpressionDict.cpp FourierAnalyzer.cpp R3Matrix.cpp V3.cpp
1717

18-
LIBS += $(LIBVISUAL_LIBS)
18+
LIBS = $(LIBVISUAL_LIBS)
1919
AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
2020

2121
noinst_LTLIBRARIES = libmath.la

‎libvisual-plugins/plugins/actor/G-Force/GForceCommon/Makefile.am‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ INCLUDES = \
1717

1818
DATADIR = $(LIBVISUAL_PLUGINS_DATA_DIR)/actor/actor_gforce
1919

20-
LIBS += $(LIBVISUAL_LIBS)
20+
LIBS = $(LIBVISUAL_LIBS)
2121
AM_CXXFLAGS = -DDATADIR=\"$(DATADIR)\" $(LIBVISUAL_CFLAGS)
2222

2323

2424
noinst_LTLIBRARIES = libgforce.la
25-
#lib_LTLIBRARIES = libgforce.la
26-
27-
#libdir = $(prefix)/lib/libvisual/actor
2825

2926
libgforce_la_SOURCES = DeltaField.cpp G-Force.cpp GF_Palette.cpp\
3027
GForcePixPort.cpp ParticleGroup.cpp WaveShape.cpp

‎libvisual-plugins/plugins/actor/G-Force/unix/libmfl/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ ALLSOURCES = mfl.c
22

33
noinst_LTLIBRARIES = libmfl.la
44

5-
LIBS += $(LIBVISUAL_LIBS)
5+
LIBS = $(LIBVISUAL_LIBS)
66
AM_CFLAGS = $(LIBVISUAL_CFLAGS)
77

88
libmfl_la_SOURCES = $(ALLSOURCES)
99

1010
EXTRA_DIST = libmfl.h
11-

‎libvisual-plugins/plugins/actor/G-Force/unix/libvisual/Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## Process this file with automake to generate a Makefile.in
22

3-
actor_plugin_LTLIBRARIES = actor_gforce.la
3+
noinst_LTLIBRARIES = libactor_gforce.la
44

55
GFORCE_TOP_SRCDIR = $(top_srcdir)/plugins/actor/G-Force
66

7-
LIBS += $(LIBVISUAL_LIBS)
7+
LIBS = $(LIBVISUAL_LIBS)
88

99
AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
1010

@@ -19,6 +19,6 @@ INCLUDES = \
1919
-I$(GFORCE_TOP_SRCDIR)/unix/libmfl \
2020
-I$(top_srcdir)
2121

22-
actor_gforce_la_LDFLAGS = -module -avoid-version
22+
libactor_gforce_la_LDFLAGS = -module -avoid-version
2323

24-
actor_gforce_la_SOURCES = actor_gforce.cpp
24+
libactor_gforce_la_SOURCES = actor_gforce.cpp

‎libvisual-plugins/plugins/actor/pseudotoad_flower/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ actor_flower_la_LDFLAGS = -module -avoid-version
66
actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
77
actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
88

9-
actor_flower_la_SOURCES =
9+
actor_flower_la_SOURCES = \
1010
actor_flower.c \
1111
main.c \
1212
main.h \

‎libvisual-plugins/po/es_AR.po‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Libvisual plugins 0.3.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2006-02-25 19:55+0100\n"
11+
"POT-Creation-Date: 2006-03-08 20:52+0800\n"
1212
"PO-Revision-Date: 2005-03-16 00:11-0300\n"
1313
"Last-Translator: Duilio Javier Protti <[email protected]>\n"
1414
"Language-Team: Spanish <[email protected]>\n"
@@ -90,21 +90,6 @@ msgstr ""
9090
msgid "This plugin shows dancing particles"
9191
msgstr ""
9292

93-
#: plugins/actor/dna/actor_lv_dna.c:51
94-
msgid ""
95-
"Written by: Dennis Smit <[email protected]>, after some begging by "
96-
"Ronald Bultje"
97-
msgstr ""
98-
99-
#: plugins/actor/dna/actor_lv_dna.c:53
100-
msgid "Libvisual DNA helix animation plugin"
101-
msgstr ""
102-
103-
#: plugins/actor/dna/actor_lv_dna.c:54
104-
msgid ""
105-
"This plugin shows an openGL DNA twisting unfolding and folding on the music"
106-
msgstr ""
107-
10893
#: plugins/actor/gdkpixbuf/actor_gdkpixbuf.c:86
10994
msgid "GdkPixbuf image loader for libvisual"
11095
msgstr "Cargador de imágenes GdkPixbuf para Libvisual"
@@ -224,16 +209,6 @@ msgstr ""
224209
"Éste plugin es un port del bien conocido plugin para Winamp G-Force, basado "
225210
"en un viejo port a unix"
226211

227-
#: plugins/actor/goom2/actor_goom2.c:74
228-
msgid "Libvisual goom2 plugin"
229-
msgstr ""
230-
231-
#: plugins/actor/goom2/actor_goom2.c:75
232-
msgid ""
233-
"This plugin adds support for the supercool goom2 plugin that is simply "
234-
"awesome"
235-
msgstr ""
236-
237212
#: plugins/actor/infinite/lv_infinite.c:60
238213
msgid ""
239214
"Original by: Julien Carme <[email protected]>, Port by: Dennis Smit "

‎libvisual-plugins/po/es_ES.po‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Libvisual plugins 0.3.0\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2006-02-25 19:55+0100\n"
11+
"POT-Creation-Date: 2006-03-08 20:52+0800\n"
1212
"PO-Revision-Date: 2005-03-16 00:11-0300\n"
1313
"Last-Translator: Duilio Javier Protti <[email protected]>\n"
1414
"Language-Team: Spanish <[email protected]>\n"
@@ -90,21 +90,6 @@ msgstr ""
9090
msgid "This plugin shows dancing particles"
9191
msgstr ""
9292

93-
#: plugins/actor/dna/actor_lv_dna.c:51
94-
msgid ""
95-
"Written by: Dennis Smit <[email protected]>, after some begging by "
96-
"Ronald Bultje"
97-
msgstr ""
98-
99-
#: plugins/actor/dna/actor_lv_dna.c:53
100-
msgid "Libvisual DNA helix animation plugin"
101-
msgstr ""
102-
103-
#: plugins/actor/dna/actor_lv_dna.c:54
104-
msgid ""
105-
"This plugin shows an openGL DNA twisting unfolding and folding on the music"
106-
msgstr ""
107-
10893
#: plugins/actor/gdkpixbuf/actor_gdkpixbuf.c:86
10994
msgid "GdkPixbuf image loader for libvisual"
11095
msgstr "Cargador de imágenes GdkPixbuf para Libvisual"
@@ -224,16 +209,6 @@ msgstr ""
224209
"Éste plugin es un port del bien conocido plugin para Winamp G-Force, basado "
225210
"en un viejo port a unix"
226211

227-
#: plugins/actor/goom2/actor_goom2.c:74
228-
msgid "Libvisual goom2 plugin"
229-
msgstr ""
230-
231-
#: plugins/actor/goom2/actor_goom2.c:75
232-
msgid ""
233-
"This plugin adds support for the supercool goom2 plugin that is simply "
234-
"awesome"
235-
msgstr ""
236-
237212
#: plugins/actor/infinite/lv_infinite.c:60
238213
msgid ""
239214
"Original by: Julien Carme <[email protected]>, Port by: Dennis Smit "

0 commit comments

Comments
 (0)