From 9a085abcbd7842aaede9e5aba9587cb9d7f38005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 19 Jan 2007 03:04:11 +0000 Subject: LIBTOOL is already defined by.. err.. libtool, no need to repeat here. CVS patchset: 8535 CVS date: 2007/01/19 03:04:11 --- misc/Makefile.common | 1 - 1 file changed, 1 deletion(-) (limited to 'misc') diff --git a/misc/Makefile.common b/misc/Makefile.common index e0bcc28ef..dfcdcfa9b 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -1,4 +1,3 @@ -LIBTOOL = $(SHELL) $(top_builddir)/libtool XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la $(XINE_LIB): -- cgit v1.2.3 From b96aa212a0661cd1daf2cef5c1e3bfa5fa0432da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 23 Jan 2007 16:50:11 +0000 Subject: Add xineplugdir variable so that the makefiles installing plugins can simply use xineplug_LTLIBRARIES without having to reset libdir every time. CVS patchset: 8546 CVS date: 2007/01/23 16:50:11 --- misc/Makefile.common | 1 + 1 file changed, 1 insertion(+) (limited to 'misc') diff --git a/misc/Makefile.common b/misc/Makefile.common index dfcdcfa9b..39fd94541 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -1,4 +1,5 @@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +xineplugdir = $(XINE_PLUGINDIR) $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) -- cgit v1.2.3 From 5b46a65efaea9902516ba88503b258c140ad4fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 21 Feb 2007 23:07:45 +0000 Subject: Make -Wl,-z,defs an opt-in ldflag, if available. The $(xineplug_ldflags) variable can be injected in _LDFLAGS for the xine plugins, and already provides -avoid-version -module and -Wl,-z,defs if supported. Right now only wavpack plugin actually make use of this but that can be fixed as the Makefiles are edited. CVS patchset: 8618 CVS date: 2007/02/21 23:07:45 --- misc/Makefile.common | 2 ++ 1 file changed, 2 insertions(+) (limited to 'misc') diff --git a/misc/Makefile.common b/misc/Makefile.common index 39fd94541..200617c2a 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -1,5 +1,7 @@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la + xineplugdir = $(XINE_PLUGINDIR) +xineplug_ldflags = $(NOUNDEF) -avoid-version -module $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) -- cgit v1.2.3 From a7a26b8bbbdbe018230609facd6d3264687baaa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 10 Mar 2007 00:17:29 +0000 Subject: Quote id -u usage so that it doesn't throw an error in Solaris older than 11. Patch by Albert Lee. CVS patchset: 8654 CVS date: 2007/03/10 00:17:29 --- misc/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'misc') diff --git a/misc/Makefile.common b/misc/Makefile.common index 200617c2a..ad23067f6 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -12,7 +12,7 @@ install-data-hook: $(top_srcdir)/post-install.sh ; \ fi; \ fi; \ - if test -x /usr/bin/chcon -a `id -u` -eq 0; then \ + if test -x /usr/bin/chcon -a "`id -u`" -eq 0; then \ list='$(lib_LTLIBRARIES)'; \ if test -n "$$list" ; then \ for p in $$list; do \ -- cgit v1.2.3 From 63f41055e2031631c01aee2539fa1a6027513078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 22 Mar 2007 17:37:17 +0000 Subject: Instead of rewriting the install and uninstall rules for headers, simply change their class to xineinclude, and set xineincludedir in Makefile.common. CVS patchset: 8737 CVS date: 2007/03/22 17:37:17 --- misc/Makefile.common | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'misc') diff --git a/misc/Makefile.common b/misc/Makefile.common index ad23067f6..b3772941f 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -1,5 +1,7 @@ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +xineincludedir = $(includedir)/xine + xineplugdir = $(XINE_PLUGINDIR) xineplug_ldflags = $(NOUNDEF) -avoid-version -module @@ -39,21 +41,6 @@ install-debug: debug done; $(MAKE) $(AM_MAKEFLAGS) install-data-hook -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(install_sh) -d $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - uninstall-hook: @if echo '$(libdir)' | egrep ^'$(XINE_PLUGINDIR)' >/dev/null; then \ list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- cgit v1.2.3 From 62b1bb0c213c37b58e5a7bb8359f41168c34f817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Thu, 22 Mar 2007 20:44:58 +0000 Subject: Fix crosscompile to use build and host definition from autoconf, rather than using hacksaround. Also replace the whole pthread check with an improved macro originally written for XCB, this way it's not going to try linking the fake -lpthread on Darwin, and it also does not force a -I/usr/local/include on FreeBSD. The new macro respects the same variables set by ports, so that it's even more transparent to FreeBSD users. CVS patchset: 8739 CVS date: 2007/03/22 20:44:58 --- misc/libxine.pc.in | 4 ++-- misc/xine-config.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'misc') diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index ea21d74a3..032eedfc1 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -7,5 +7,5 @@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ Requires: -Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ -Cflags: -I${includedir} @THREAD_CPPFLAGS@ +Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ +Cflags: -I${includedir} @PTHREAD_CFLAGS@ diff --git a/misc/xine-config.in b/misc/xine-config.in index e21bed104..8d288b22b 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -100,11 +100,11 @@ if test "$echo_acflags" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ @THREAD_CPPFLAGS@ + echo -I@includedir@ @PTHREAD_CFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ + echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ fi if test "$echo_plugindir" = "yes"; then echo "@XINE_PLUGINPATH@" -- cgit v1.2.3 From 6ff7b823ea37c8baa725fad659b06b23e1d92d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Mon, 2 Apr 2007 20:44:04 +0200 Subject: Migrate all .cvsignore files to .hgignore. --HG-- rename : .cvsignore => .hgignore rename : doc/.cvsignore => doc/.hgignore rename : doc/faq/.cvsignore => doc/faq/.hgignore rename : doc/hackersguide/.cvsignore => doc/hackersguide/.hgignore rename : doc/man/.cvsignore => doc/man/.hgignore rename : doc/man/en/.cvsignore => doc/man/en/.hgignore rename : include/.cvsignore => include/.hgignore rename : intl/.cvsignore => intl/.hgignore rename : lib/.cvsignore => lib/.hgignore rename : m4/.cvsignore => m4/.hgignore rename : misc/.cvsignore => misc/.hgignore rename : misc/fonts/.cvsignore => misc/fonts/.hgignore rename : po/.cvsignore => po/.hgignore rename : src/.cvsignore => src/.hgignore rename : src/audio_out/.cvsignore => src/audio_out/.hgignore rename : src/combined/.cvsignore => src/combined/.hgignore rename : src/demuxers/.cvsignore => src/demuxers/.hgignore rename : src/dxr3/.cvsignore => src/dxr3/.hgignore rename : src/input/.cvsignore => src/input/.hgignore rename : src/input/dvb/.cvsignore => src/input/dvb/.hgignore rename : src/input/libdvdnav/.cvsignore => src/input/libdvdnav/.hgignore rename : src/input/libreal/.cvsignore => src/input/libreal/.hgignore rename : src/input/librtsp/.cvsignore => src/input/librtsp/.hgignore rename : src/input/vcd/.cvsignore => src/input/vcd/.hgignore rename : src/input/vcd/libcdio/.cvsignore => src/input/vcd/libcdio/.hgignore rename : src/input/vcd/libcdio/MSWindows/.cvsignore => src/input/vcd/libcdio/MSWindows/.hgignore rename : src/input/vcd/libcdio/cdio/.cvsignore => src/input/vcd/libcdio/cdio/.hgignore rename : src/input/vcd/libcdio/image/.cvsignore => src/input/vcd/libcdio/image/.hgignore rename : src/input/vcd/libvcd/.cvsignore => src/input/vcd/libvcd/.hgignore rename : src/input/vcd/libvcd/libvcd/.cvsignore => src/input/vcd/libvcd/libvcd/.hgignore rename : src/liba52/.cvsignore => src/liba52/.hgignore rename : src/libdts/.cvsignore => src/libdts/.hgignore rename : src/libfaad/.cvsignore => src/libfaad/.hgignore rename : src/libfaad/codebook/.cvsignore => src/libfaad/codebook/.hgignore rename : src/libffmpeg/.cvsignore => src/libffmpeg/.hgignore rename : src/libffmpeg/libavcodec/.cvsignore => src/libffmpeg/libavcodec/.hgignore rename : src/libffmpeg/libavcodec/alpha/.cvsignore => src/libffmpeg/libavcodec/alpha/.hgignore rename : src/libffmpeg/libavcodec/armv4l/.cvsignore => src/libffmpeg/libavcodec/armv4l/.hgignore rename : src/libffmpeg/libavcodec/i386/.cvsignore => src/libffmpeg/libavcodec/i386/.hgignore rename : src/libffmpeg/libavcodec/libpostproc/.cvsignore => src/libffmpeg/libavcodec/libpostproc/.hgignore rename : src/libffmpeg/libavcodec/mlib/.cvsignore => src/libffmpeg/libavcodec/mlib/.hgignore rename : src/libffmpeg/libavcodec/ppc/.cvsignore => src/libffmpeg/libavcodec/ppc/.hgignore rename : src/libffmpeg/libavcodec/sparc/.cvsignore => src/libffmpeg/libavcodec/sparc/.hgignore rename : src/libffmpeg/libavutil/.cvsignore => src/libffmpeg/libavutil/.hgignore rename : src/libflac/.cvsignore => src/libflac/.hgignore rename : src/liblpcm/.cvsignore => src/liblpcm/.hgignore rename : src/libmad/.cvsignore => src/libmad/.hgignore rename : src/libmpeg2/.cvsignore => src/libmpeg2/.hgignore rename : src/libmpeg2new/.cvsignore => src/libmpeg2new/.hgignore rename : src/libmpeg2new/include/.cvsignore => src/libmpeg2new/include/.hgignore rename : src/libmpeg2new/libmpeg2/.cvsignore => src/libmpeg2new/libmpeg2/.hgignore rename : src/libmusepack/.cvsignore => src/libmusepack/.hgignore rename : src/libmusepack/musepack/.cvsignore => src/libmusepack/musepack/.hgignore rename : src/libreal/.cvsignore => src/libreal/.hgignore rename : src/libspeex/.cvsignore => src/libspeex/.hgignore rename : src/libspucc/.cvsignore => src/libspucc/.hgignore rename : src/libspucmml/.cvsignore => src/libspucmml/.hgignore rename : src/libspudec/.cvsignore => src/libspudec/.hgignore rename : src/libspudvb/.cvsignore => src/libspudvb/.hgignore rename : src/libsputext/.cvsignore => src/libsputext/.hgignore rename : src/libtheora/.cvsignore => src/libtheora/.hgignore rename : src/libvorbis/.cvsignore => src/libvorbis/.hgignore rename : src/libw32dll/.cvsignore => src/libw32dll/.hgignore rename : src/libw32dll/DirectShow/.cvsignore => src/libw32dll/DirectShow/.hgignore rename : src/libw32dll/dmo/.cvsignore => src/libw32dll/dmo/.hgignore rename : src/libw32dll/qtx/.cvsignore => src/libw32dll/qtx/.hgignore rename : src/libw32dll/qtx/qtxsdk/.cvsignore => src/libw32dll/qtx/qtxsdk/.hgignore rename : src/libw32dll/wine/.cvsignore => src/libw32dll/wine/.hgignore rename : src/libxineadec/.cvsignore => src/libxineadec/.hgignore rename : src/libxineadec/gsm610/.cvsignore => src/libxineadec/gsm610/.hgignore rename : src/libxineadec/nosefart/.cvsignore => src/libxineadec/nosefart/.hgignore rename : src/libxinevdec/.cvsignore => src/libxinevdec/.hgignore rename : src/post/.cvsignore => src/post/.hgignore rename : src/post/audio/.cvsignore => src/post/audio/.hgignore rename : src/post/deinterlace/.cvsignore => src/post/deinterlace/.hgignore rename : src/post/deinterlace/plugins/.cvsignore => src/post/deinterlace/plugins/.hgignore rename : src/post/goom/.cvsignore => src/post/goom/.hgignore rename : src/post/mosaico/.cvsignore => src/post/mosaico/.hgignore rename : src/post/planar/.cvsignore => src/post/planar/.hgignore rename : src/post/visualizations/.cvsignore => src/post/visualizations/.hgignore rename : src/video_out/.cvsignore => src/video_out/.hgignore rename : src/video_out/libdha/.cvsignore => src/video_out/libdha/.hgignore rename : src/video_out/libdha/bin/.cvsignore => src/video_out/libdha/bin/.hgignore rename : src/video_out/libdha/kernelhelper/.cvsignore => src/video_out/libdha/kernelhelper/.hgignore rename : src/video_out/libdha/oth/.cvsignore => src/video_out/libdha/oth/.hgignore rename : src/video_out/libdha/sysdep/.cvsignore => src/video_out/libdha/sysdep/.hgignore rename : src/video_out/macosx/.cvsignore => src/video_out/macosx/.hgignore rename : src/video_out/vidix/.cvsignore => src/video_out/vidix/.hgignore rename : src/video_out/vidix/drivers/.cvsignore => src/video_out/vidix/drivers/.hgignore rename : src/xine-engine/.cvsignore => src/xine-engine/.hgignore rename : src/xine-utils/.cvsignore => src/xine-utils/.hgignore rename : win32/.cvsignore => win32/.hgignore rename : win32/include/.cvsignore => win32/include/.hgignore --- misc/.cvsignore | 8 -------- misc/.hgignore | 8 ++++++++ misc/fonts/.cvsignore | 2 -- misc/fonts/.hgignore | 2 ++ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 misc/.cvsignore create mode 100644 misc/.hgignore delete mode 100644 misc/fonts/.cvsignore create mode 100644 misc/fonts/.hgignore (limited to 'misc') diff --git a/misc/.cvsignore b/misc/.cvsignore deleted file mode 100644 index fe4e75d06..000000000 --- a/misc/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -Makefile -Makefile.in -SlackBuild -build_rpms.sh -libxine.pc -relchk.sh -xine-config -xine-lib.spec diff --git a/misc/.hgignore b/misc/.hgignore new file mode 100644 index 000000000..fe4e75d06 --- /dev/null +++ b/misc/.hgignore @@ -0,0 +1,8 @@ +Makefile +Makefile.in +SlackBuild +build_rpms.sh +libxine.pc +relchk.sh +xine-config +xine-lib.spec diff --git a/misc/fonts/.cvsignore b/misc/fonts/.cvsignore deleted file mode 100644 index 282522db0..000000000 --- a/misc/fonts/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/misc/fonts/.hgignore b/misc/fonts/.hgignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/misc/fonts/.hgignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in -- cgit v1.2.3