diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/.hgignore | 1 | ||||
| -rw-r--r-- | misc/Makefile.am | 62 | ||||
| -rw-r--r-- | misc/Makefile.common | 17 | ||||
| -rw-r--r-- | misc/Makefile.quiet | 2 | ||||
| -rw-r--r-- | misc/SlackBuild.in | 14 | ||||
| -rw-r--r-- | misc/build_rpms.sh.in | 12 | ||||
| -rw-r--r-- | misc/fonts/Makefile.am | 45 | ||||
| -rw-r--r-- | misc/libxine.pc.in | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | misc/relchk.sh.in | 2 | ||||
| -rw-r--r-- | misc/xine-config.in | 3 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 23 |
11 files changed, 81 insertions, 102 deletions
diff --git a/misc/.hgignore b/misc/.hgignore index e126a36c8..319895304 100644 --- a/misc/.hgignore +++ b/misc/.hgignore @@ -2,5 +2,4 @@ SlackBuild build_rpms.sh libxine.pc relchk.sh -xine-config xine-lib.spec diff --git a/misc/Makefile.am b/misc/Makefile.am index f6c362d13..60446e2fd 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,21 +1,19 @@ +include $(top_srcdir)/misc/Makefile.quiet include $(top_srcdir)/misc/Makefile.common -SUBDIRS = fonts - EXTRA_DIST = build_rpms.sh \ - cdda_server.c \ SlackBuild.in \ SlackBuild \ vga.xinefont.gz \ xine-config \ - xine-fontconv.c \ xine-lib.spec.in \ xine-lib.spec \ libxine.pc.in \ logo/xine_logo_text.svg \ libdvdcss-1.2.6-network.patch \ Makefile.plugins.in \ - Makefile.common + Makefile.common \ + fonts/cetus.ttf bin_SCRIPTS = xine-config bin_PROGRAMS = xine-list-@XINE_SERIES@ @@ -25,8 +23,54 @@ pkgconfig_DATA=libxine.pc xine_list_@XINE_SERIES@_SOURCES = xine-list.c xine_list_@XINE_SERIES@_LDADD = $(XINE_LIB) -xine-fontconv: xine-fontconv.c - $(CC) -W -Wall -g -o xine-fontconv xine-fontconv.c -lz `freetype-config --cflags` `freetype-config --libs` +fontdir = $(pkgdatadir)/fonts +dist_font_DATA = \ + fonts/cetus-16.xinefont.gz \ + fonts/cetus-20.xinefont.gz \ + fonts/cetus-24.xinefont.gz \ + fonts/cetus-32.xinefont.gz \ + fonts/cetus-48.xinefont.gz \ + fonts/cetus-64.xinefont.gz \ + fonts/cc-16.xinefont.gz \ + fonts/cc-20.xinefont.gz \ + fonts/cc-24.xinefont.gz \ + fonts/cc-32.xinefont.gz \ + fonts/cc-48.xinefont.gz \ + fonts/cc-64.xinefont.gz \ + fonts/cci-16.xinefont.gz \ + fonts/cci-20.xinefont.gz \ + fonts/cci-24.xinefont.gz \ + fonts/cci-32.xinefont.gz \ + fonts/cci-48.xinefont.gz \ + fonts/cci-64.xinefont.gz \ + fonts/mono-16.xinefont.gz \ + fonts/mono-20.xinefont.gz \ + fonts/mono-24.xinefont.gz \ + fonts/mono-32.xinefont.gz \ + fonts/mono-48.xinefont.gz \ + fonts/mono-64.xinefont.gz \ + fonts/sans-16.xinefont.gz \ + fonts/sans-20.xinefont.gz \ + fonts/sans-24.xinefont.gz \ + fonts/sans-32.xinefont.gz \ + fonts/sans-48.xinefont.gz \ + fonts/sans-64.xinefont.gz \ + fonts/serif-16.xinefont.gz \ + fonts/serif-20.xinefont.gz \ + fonts/serif-24.xinefont.gz \ + fonts/serif-32.xinefont.gz \ + fonts/serif-48.xinefont.gz \ + fonts/serif-64.xinefont.gz + +dist_doc_DATA = fonts/README.cetus + +EXTRA_PROGRAMS = xine-fontconv cdda_server + +xine_fontconv_SOURCES = xine-fontconv.c +xine_fontconv_CFLAGS = $(FT2_CFLAGS) +xine_fontconv_LDFLAGS = $(GCSECTIONS) +xine_fontconv_LDADD = -lz $(FT2_LIBS) -cdda_server: cdda_server.c - $(CC) -W -Wall -g -o cdda_server cdda_server.c -ldl +cdda_server_SOURCES = cdda_server.c +cdda_server_LDFLAGS = $(GCSECTIONS) +cdda_server_LDADD = $(DYNAMIC_LD_LIBS) diff --git a/misc/Makefile.common b/misc/Makefile.common index 4adab1527..0202a8dea 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -3,13 +3,16 @@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la xineincludedir = $(includedir)/xine xineplugdir = $(XINE_PLUGINDIR) -xineplug_ldflags = $(LDFLAGS_NOUNDEFINED) -avoid-version -module +xineplug_ldflags = $(LDFLAGS_NOUNDEFINED) $(GCSECTIONS) -avoid-version -module xinepostdir = $(XINE_PLUGINDIR)/post vidixdir = $(XINE_PLUGINDIR)/vidix $(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) + $(MAKE) -C $(top_builddir)/src/xine-engine libxine.la + +$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la: + $(MAKE) -C $(top_builddir)/contrib/libxdg-basedir install-data-hook: @if test $$MAKELEVEL -le 4 ; then \ @@ -38,16 +41,6 @@ pass1: pass2: @$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)" -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit; \ - done; - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - uninstall-hook: @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ diff --git a/misc/Makefile.quiet b/misc/Makefile.quiet new file mode 100644 index 000000000..8ee368920 --- /dev/null +++ b/misc/Makefile.quiet @@ -0,0 +1,2 @@ +GNU_VERBOSITY := $(if $(findstring GNU,$(shell $(MAKE) -v)),0,1) +V ?= $(GNU_VERBOSITY) diff --git a/misc/SlackBuild.in b/misc/SlackBuild.in index d356a1766..118613c6a 100644 --- a/misc/SlackBuild.in +++ b/misc/SlackBuild.in @@ -27,7 +27,7 @@ EOF # do_descr() { cat > package_descriptions << EOF -@PACKAGE@: @PACKAGE@ @SPEC_VERSION@. +@PACKAGE@: @PACKAGE@ @PACKAGE_VERSION@. @PACKAGE@: @PACKAGE@: xine-lib is the beating heart of xine (a free gpl-licensed @PACKAGE@: video player for unix-like systems) which among others provides @@ -53,12 +53,12 @@ do_build() { cd $CWD rm -rf $TMPBUILD mkdir -p $TMPBUILD - cd $TMPBUILD && tar -xzf $CWD/@TAR_NAME@.tar.gz + cd $TMPBUILD && tar -xzf $CWD/@PACKAGE_TARNAME@.tar.gz do_install_sh; - cd @TAR_NAME@ + cd @PACKAGE_TARNAME@ DIE=1 - echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs" && \ - ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@TAR_NAME@/src/xine-engine/.libs && \ + echo "./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs" && \ + ./configure --prefix=$PREFIX $CONFIG_OPT && make && make install-strip DESTDIR=$PKG LIBRARY_PATH=$TMPBUILD/@PACKAGE_TARNAME@/src/xine-engine/.libs && \ mkdir -p $PKG/install && cp $TMPBUILD/doinst.sh $PKG/install && \ cd $PKG && \ echo "n" | /sbin/makepkg $PACKAGE && \ @@ -172,7 +172,7 @@ main() { build_pentium build_k6 build_k7 - mv -f $CWD/@TAR_NAME@.tar.gz $SLCK + mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK } @@ -184,7 +184,7 @@ build_arch() { mkdir -p $SLCK rm -f config.cache && ./autogen.sh && make dist $barch - mv -f $CWD/@TAR_NAME@.tar.gz $SLCK + mv -f $CWD/@PACKAGE_TARNAME@.tar.gz $SLCK } case "$1" in diff --git a/misc/build_rpms.sh.in b/misc/build_rpms.sh.in index b3ec065b1..c3096e5f0 100644 --- a/misc/build_rpms.sh.in +++ b/misc/build_rpms.sh.in @@ -44,9 +44,9 @@ export XINE_BUILD=i586-pc-linux-gnu eval $RPM_BA -mv /usr/src/redhat/SRPMS/libxine-@SPEC_VERSION@-$DATE.src.rpm ./rpms/ -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i586.rpm -mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@SPEC_VERSION@-$DATE.i586.rpm +mv /usr/src/redhat/SRPMS/libxine-@PACKAGE_VERSION@-$DATE.src.rpm ./rpms/ +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i586.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-devel-@PACKAGE_VERSION@-$DATE.i586.rpm echo "*****************************************************" echo @@ -61,7 +61,7 @@ export XINE_BUILD=i686-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.i686.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.i686.rpm echo "*****************************************************" echo @@ -76,7 +76,7 @@ export XINE_BUILD=k6-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k6.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k6.rpm echo "*****************************************************" echo @@ -91,6 +91,6 @@ export XINE_BUILD=athlon-pc-linux-gnu eval $RPM_BB -mv /usr/src/redhat/RPMS/i386/$PKGNAME-@SPEC_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@SPEC_VERSION@-$DATE.k7.rpm +mv /usr/src/redhat/RPMS/i386/$PKGNAME-@PACKAGE_VERSION@-$DATE.i386.rpm ./rpms/$PKGNAME-@PACKAGE_VERSION@-$DATE.k7.rpm echo "Done." diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am deleted file mode 100644 index 2246db20d..000000000 --- a/misc/fonts/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -include $(top_srcdir)/misc/Makefile.common - -fontdir = $(XINE_FONTDIR) -font_DATA = \ - cetus-16.xinefont.gz \ - cetus-20.xinefont.gz \ - cetus-24.xinefont.gz \ - cetus-32.xinefont.gz \ - cetus-48.xinefont.gz \ - cetus-64.xinefont.gz \ - cc-16.xinefont.gz \ - cc-20.xinefont.gz \ - cc-24.xinefont.gz \ - cc-32.xinefont.gz \ - cc-48.xinefont.gz \ - cc-64.xinefont.gz \ - cci-16.xinefont.gz \ - cci-20.xinefont.gz \ - cci-24.xinefont.gz \ - cci-32.xinefont.gz \ - cci-48.xinefont.gz \ - cci-64.xinefont.gz \ - mono-16.xinefont.gz \ - mono-20.xinefont.gz \ - mono-24.xinefont.gz \ - mono-32.xinefont.gz \ - mono-48.xinefont.gz \ - mono-64.xinefont.gz \ - sans-16.xinefont.gz \ - sans-20.xinefont.gz \ - sans-24.xinefont.gz \ - sans-32.xinefont.gz \ - sans-48.xinefont.gz \ - sans-64.xinefont.gz \ - serif-16.xinefont.gz \ - serif-20.xinefont.gz \ - serif-24.xinefont.gz \ - serif-32.xinefont.gz \ - serif-48.xinefont.gz \ - serif-64.xinefont.gz - -# -# font used for osd -# -EXTRA_DIST = cetus.ttf README.cetus $(font_DATA) diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index 6c27f698d..cf5bf854e 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -21,7 +21,7 @@ xine_list=${bindir}/xine-list-@XINE_SERIES@@EXEEXT@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@ -Requires: +Requires.private: @XDG_BASEDIR_REQUIRES@ Libs: -L${libdir} -lxine Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ Cflags: -I${includedir} diff --git a/misc/relchk.sh.in b/misc/relchk.sh.in index 242a97486..09cce24b2 100644..100755 --- a/misc/relchk.sh.in +++ b/misc/relchk.sh.in @@ -4,7 +4,7 @@ ## topdir="`pwd`" -distdir="@TAR_NAME@" +distdir="@PACKAGE_TARNAME@" log="$topdir/dist-log" logerror="$topdir/dist-errors" diff --git a/misc/xine-config.in b/misc/xine-config.in index 700f1169c..3a3fd4b4d 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -16,6 +16,7 @@ usage() { cat <<EOF Usage: xine-config [OPTIONS] [LIBRARIES] + DEPRECATED. Use pkg-config instead. Options: [--prefix[=DIR]] [--exec-prefix[=DIR]] @@ -76,6 +77,8 @@ while test $# -gt 0; do shift done +echo 'xine-config is DEPRECATED. Use pkg-config instead.' >&2 + exec pkg-config "${prefix+--define-variable=prefix=}$prefix" \ "${exec_prefix+--define-variable=exec_prefix=}$exec_prefix" \ $args libxine diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index 952c5e0d2..1874514e5 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -1,5 +1,5 @@ %define shortname libxine -%define name libxine1 +%define name libxine2 %define version @SPEC_VERSION@ %define release 0 @@ -15,9 +15,6 @@ %if %{?BUILD_ALSA:0}%{!?BUILD_ALSA:1} %define BUILD_ALSA 0 %endif -%if %{?BUILD_ARTS:0}%{!?BUILD_ARTS:1} -%define BUILD_ARTS 0 -%endif %if %{?BUILD_DEVEL:0}%{!?BUILD_DEVEL:1} %define BUILD_DEVEL 1 %endif @@ -689,17 +686,11 @@ fi %if %BUILD_STK --with-libstk \ %endif -%if %BUILD_ARTS - --with-arts \ -%endif --enable-syncfb --without-internal-vcdlibs # Error in libfaad when compiling with mmx or sse enabled, remove it -%{__mv} src/libfaad/Makefile src/libfaad/Makefile_save -%{__cat} src/libfaad/Makefile_save | %{__sed} -e "s/-mmmx/-mno-mmx/g" -e "s/-msse/-mno-sse/g" > src/libfaad/Makefile -# another problem with libavcodec -%{__mv} src/libffmpeg/libavcodec/i386/Makefile src/libffmpeg/libavcodec/i386/Makefile_save -%{__cat} src/libffmpeg/libavcodec/i386/Makefile_save | %{__sed} -e "s/-O3/-Os/g" -e "s/-O2/-Os/g" > src/libffmpeg/libavcodec/i386/Makefile +%{__mv} contrib/libfaad/Makefile contrib/libfaad/Makefile_save +%{__cat} contrib/libfaad/Makefile_save | %{__sed} -e "s/-mmmx/-mno-mmx/g" -e "s/-msse/-mno-sse/g" > contrib/libfaad/Makefile %{__make} %{?jobs:-j%{jobs}} @@ -739,14 +730,6 @@ echo "%defattr(-,root,root)" > ${RPM_BUILD_DIR}/filelist_%{name}_alsa %{__rm} ${RPM_BUILD_DIR}/filelist_%{name}_old %endif -%if %BUILD_ARTS -echo "%defattr(-,root,root)" > ${RPM_BUILD_DIR}/filelist_%{name}_arts -%{__mv} ${RPM_BUILD_DIR}/filelist_%{name} ${RPM_BUILD_DIR}/filelist_%{name}_old -%{__grep} "xineplug_ao_out_arts\." ${RPM_BUILD_DIR}/filelist_%{name}_old | %{__cat} - >> ${RPM_BUILD_DIR}/filelist_%{name}_arts -%{__grep} -v "xineplug_ao_out_arts\." ${RPM_BUILD_DIR}/filelist_%{name}_old | %{__cat} - > ${RPM_BUILD_DIR}/filelist_%{name} -%{__rm} ${RPM_BUILD_DIR}/filelist_%{name}_old -%endif - %if %BUILD_ESD echo "%defattr(-,root,root)" > ${RPM_BUILD_DIR}/filelist_%{name}_esd %{__mv} ${RPM_BUILD_DIR}/filelist_%{name} ${RPM_BUILD_DIR}/filelist_%{name}_old |