diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-02 07:45:55 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-05-02 07:45:55 +0000 |
| commit | e45adba3ac1e78dd736ba896fb60f4f20e3db301 (patch) | |
| tree | 0d98b4a262061589ac7310b2409708462e1cf9b0 | |
| parent | fe98e9b0a0ab7fae382cba26239492970e7d7253 (diff) | |
| download | xine-lib-e45adba3ac1e78dd736ba896fb60f4f20e3db301.tar.gz xine-lib-e45adba3ac1e78dd736ba896fb60f4f20e3db301.tar.bz2 | |
Fix xine-logoconv removal and new logo mpeg adding.
CVS patchset: 1831
CVS date: 2002/05/02 07:45:55
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | misc/Makefile.am | 11 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 5 |
3 files changed, 3 insertions, 29 deletions
diff --git a/configure.in b/configure.in index 02453f2ec..534ce32ca 100644 --- a/configure.in +++ b/configure.in @@ -256,22 +256,6 @@ AC_SUBST(ZLIB_LIBS) dnl -dnl Imlib (for xine-logoconv) -dnl -AC_PATH_PROG(IMLIB_CONFIG, imlib-config, no) -if test "$IMLIB_CONFIG" != "no" ; then - AC_CHECK_HEADER(Imlib.h, - [ have_imlib="yes" - IMLIB_CFLAGS=`$IMLIB_CONFIG --cflags` - IMLIB_LIBS=`$IMLIB_CONFIG --libs` ]) -fi - -AM_CONDITIONAL(HAVE_IMLIB, [test x"$have_imlib" = "xyes"]) -AC_SUBST(IMLIB_CFLAGS) -AC_SUBST(IMLIB_LIBS) - - -dnl dnl Checks for Xv extension dnl dnl static linking with libXv is preferred! diff --git a/misc/Makefile.am b/misc/Makefile.am index 9c774b6ab..4382df10e 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -9,17 +9,6 @@ data_DATA = xine_logo.png xine_logo.mpg bin_SCRIPTS = xine-config -if HAVE_IMLIB -logoconv = xine-logoconv -endif - -bin_PROGRAMS = $(logoconv) - -CFLAGS = $(IMLIB_CFLAGS) -xine_logoconv_SOURCES = xine-logoconv.c -xine_logoconv_LDADD = $(IMLIB_LIBS) - - debug: install-debug: install diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 0d42fd428..34a6c9196 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -285,11 +285,10 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.la %{prefix}/lib/xine/plugins/xineplug_vo_out_xshm.so # lib, logo and fonts. -@HAVE_IMLIB_TRUE@%{prefix}/bin/xine-logoconv %{prefix}/lib/libxine*.la %{prefix}/lib/libxine*.so* %{prefix}/share/xine/skins/xine_logo.png -%{prefix}/share/xine/skins/xine_logo.zyuy2 +%{prefix}/share/xine/skins/xine_logo.mpg %{prefix}/share/xine/fonts/* ## intl files %{prefix}/share/locale/fr/LC_MESSAGES/xine-lib.mo @@ -365,6 +364,8 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/xine/xine-lib-API/* %changelog +* Thu May 2 2002 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> +- sync with new logo stuff. * Wed May 1 2002 Matthias Dahl <matthew2k@web.de> - added cinepak, cyuv and msvc decode plugins - commented out sdl related parts because this is currently broken in xine-lib |