diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2003-11-15 15:18:20 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2003-11-15 15:18:20 +0000 |
commit | 46dd82e557a8b0375876b720c05429f2459c1b3d (patch) | |
tree | 304450b55825c58ecd8293735766ca37b265bd80 | |
parent | Update of the sysutils/freesbie port to a current snapshot. (diff) |
Update to 1-rc2.
Notes
Notes:
svn path=/head/; revision=94016
18 files changed, 105 insertions, 196 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 7b0c856c8a8d..cb4ee966d2f8 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xine -PORTVERSION= 1.0.r0 -PORTREVISION= 2 +PORTVERSION= 1.0.r2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMEPREFIX= lib -DISTNAME= ${PORTNAME}-lib-1-rc0a +DISTNAME= ${PORTNAME}-lib-1-rc2 MAINTAINER= nobutaka@FreeBSD.org COMMENT= Libraries for xine multimedia player @@ -43,8 +42,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread - THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" \ X_EXTRA_LIBS="-lGL -lGLU -lXext -lX11 -lm" -CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \ - --disable-vidix +CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 INSTALLS_SHLIB= yes MAN1= xine-config.1 @@ -56,10 +54,23 @@ MAN1= xine-config.1 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src:xine-engine:audio_out.c .endif +# FBIOVERTICAL macro is not defined +.if ${OSVERSION} < 500023 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src:video_out:Makefile.in +PLIST_SUB+= PGX64="@comment " +.else +PLIST_SUB+= PGX64="" +.endif + +# CDIOCREADAUDIO macro is not defined +.if ${OSVERSION} >= 501106 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src:input:input_cdda.c +.endif + .if ${XFREE86_VERSION} >= 4 -PLIST_SUB= HAVE_LIBXV="" +PLIST_SUB+= HAVE_LIBXV="" .else -PLIST_SUB= HAVE_LIBXV="@comment " +PLIST_SUB+= HAVE_LIBXV="@comment " .endif .if exists(${LOCALBASE}/bin/artsc-config) || defined(WITH_ARTS) @@ -83,6 +94,19 @@ PLIST_SUB+= HAVE_GNOMEVFS2="" PLIST_SUB+= HAVE_GNOMEVFS2="@comment " .endif +.if ${ARCH} == "i386" +PLIST_SUB+= VIDIX="" +.else +PLIST_SUB+= VIDIX="@comment " +.endif + +.if exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) +LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver +PLIST_SUB+= XVMC="" +.else +PLIST_SUB+= XVMC="@comment " +.endif + pre-everything:: @${ECHO_MSG} "===>" @${ECHO_MSG} "===> You can enable some features by defining following variables." diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo index a779e211eb2e..ed5bd0e1b796 100644 --- a/multimedia/libxine/distinfo +++ b/multimedia/libxine/distinfo @@ -1 +1 @@ -MD5 (xine-lib-1-rc0a.tar.gz) = 923015bd49902cd43cd8f191f0720e4c +MD5 (xine-lib-1-rc2.tar.gz) = 06ee51beaf77b4b9238f2bcc5b093860 diff --git a/multimedia/libxine/files/extra-patch-src:input:input_cdda.c b/multimedia/libxine/files/extra-patch-src:input:input_cdda.c new file mode 100644 index 000000000000..16e13737b59a --- /dev/null +++ b/multimedia/libxine/files/extra-patch-src:input:input_cdda.c @@ -0,0 +1,37 @@ +--- src/input/input_cdda.c.orig Sat Oct 4 01:35:54 2003 ++++ src/input/input_cdda.c Sat Nov 15 21:05:51 2003 +@@ -32,6 +32,7 @@ + #include <unistd.h> + + #include <sys/types.h> ++#include <sys/param.h> + #include <dirent.h> + #include <sys/stat.h> + #include <fcntl.h> +@@ -666,18 +667,26 @@ + unsigned char *data) { + + int fd = this_gen->fd; ++#if __FreeBSD_version < 501106 + struct ioc_read_audio cdda; ++#endif + + while( num_frames ) { ++#if __FreeBSD_version < 501106 + cdda.address_format = CD_MSF_FORMAT; + cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND; + cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE; + cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND; + cdda.nframes = 1; + cdda.buffer = data; ++#endif + ++#if __FreeBSD_version >= 501106 ++ if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) { ++#else + /* read a frame */ + if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) { ++#endif + perror("CDIOCREADAUDIO"); + return -1; + } diff --git a/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in b/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in new file mode 100644 index 000000000000..7fd8073293bc --- /dev/null +++ b/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in @@ -0,0 +1,10 @@ +--- src/video_out/Makefile.in.orig Sun Nov 9 21:14:14 2003 ++++ src/video_out/Makefile.in Sun Nov 9 21:14:50 2003 +@@ -273,7 +273,6 @@ + #if HAVE_OPENGL + #opengl_module = xineplug_vo_out_opengl.la + #endif +-@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx64_module = xineplug_vo_out_pgx64.la + + @HAVE_VIDIX_TRUE@vidix_module = xineplug_vo_out_vidix.la + diff --git a/multimedia/libxine/files/patch-src:input:input_gnome_vfs.c b/multimedia/libxine/files/patch-src:input:input_gnome_vfs.c deleted file mode 100644 index 30760b7ae423..000000000000 --- a/multimedia/libxine/files/patch-src:input:input_gnome_vfs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/input/input_gnome_vfs.c.orig Thu Aug 14 00:29:17 2003 -+++ src/input/input_gnome_vfs.c Thu Aug 14 00:29:22 2003 -@@ -33,7 +33,7 @@ - - #include <libgnomevfs/gnome-vfs.h> - --#define D(...) -+#define D(x...) - /* #define D(...) g_message (__VA_ARGS__) */ - /* #define LOG */ - diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.in b/multimedia/libxine/files/patch-src:liba52:Makefile.in index 01356e92ee90..f4caaf0f5d06 100644 --- a/multimedia/libxine/files/patch-src:liba52:Makefile.in +++ b/multimedia/libxine/files/patch-src:liba52:Makefile.in @@ -1,12 +1,13 @@ ---- src/liba52/Makefile.in.orig Sun Jan 5 18:47:47 2003 -+++ src/liba52/Makefile.in Sun Jan 5 18:47:56 2003 -@@ -208,25 +208,12 @@ +--- src/liba52/Makefile.in.orig Sun Nov 9 11:41:01 2003 ++++ src/liba52/Makefile.in Sun Nov 9 11:46:09 2003 +@@ -254,26 +254,12 @@ lib_LTLIBRARIES = xineplug_decode_a52.la -xineplug_decode_a52_la_SOURCES = \ - bitstream.c \ - bit_allocate.c \ +- crc.c \ - downmix.c \ - imdct.c \ - parse.c \ @@ -28,11 +29,11 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -@@ -234,8 +221,7 @@ +@@ -281,8 +267,7 @@ xineplug_decode_a52_la_DEPENDENCIES = \ $(top_builddir)/src/xine-engine/libxine.la --am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo \ +-am_xineplug_decode_a52_la_OBJECTS = bitstream.lo bit_allocate.lo crc.lo \ - downmix.lo imdct.lo parse.lo xine_decoder.lo +am_xineplug_decode_a52_la_OBJECTS = xine_decoder.lo xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS) diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h b/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h deleted file mode 100644 index 9743b3659da0..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/deinterlace.h.orig Sun Aug 10 01:05:01 2003 -+++ src/post/deinterlace/deinterlace.h Sun Aug 10 01:18:58 2003 -@@ -22,7 +22,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef __cplusplus diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c deleted file mode 100644 index dba2af2d3c77..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/double.c.orig Sun Aug 10 01:03:04 2003 -+++ src/post/deinterlace/plugins/double.c Sun Aug 10 01:19:26 2003 -@@ -22,7 +22,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - #include "speedy.h" - #include "deinterlace.h" diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c deleted file mode 100644 index a2e671c4e279..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/greedy.c.orig Sun Aug 10 01:21:43 2003 -+++ src/post/deinterlace/plugins/greedy.c Sun Aug 10 01:22:25 2003 -@@ -23,7 +23,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef HAVE_CONFIG_H diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c deleted file mode 100644 index 09d2d93ac1f0..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/greedy2frame.c.orig Sun Aug 10 01:30:49 2003 -+++ src/post/deinterlace/plugins/greedy2frame.c Sun Aug 10 01:31:11 2003 -@@ -23,7 +23,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef HAVE_CONFIG_H diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c deleted file mode 100644 index ed1734a5406a..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/linear.c.orig Sun Aug 10 01:24:14 2003 -+++ src/post/deinterlace/plugins/linear.c Sun Aug 10 01:24:45 2003 -@@ -20,7 +20,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - #include "speedy.h" - #include "deinterlace.h" diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c deleted file mode 100644 index cbfacddf9e56..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/linearblend.c.orig Sun Aug 10 01:26:05 2003 -+++ src/post/deinterlace/plugins/linearblend.c Sun Aug 10 01:26:34 2003 -@@ -25,7 +25,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef HAVE_CONFIG_H diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c deleted file mode 100644 index 72c449785c28..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/vfir.c.orig Sun Aug 10 01:27:59 2003 -+++ src/post/deinterlace/plugins/vfir.c Sun Aug 10 01:28:18 2003 -@@ -25,7 +25,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef HAVE_CONFIG_H diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c deleted file mode 100644 index d4be46dedd12..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/plugins/weave.c.orig Sun Aug 10 01:29:19 2003 -+++ src/post/deinterlace/plugins/weave.c Sun Aug 10 01:29:36 2003 -@@ -22,7 +22,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - #include "speedy.h" - #include "deinterlace.h" diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h b/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h deleted file mode 100644 index a9d1bce3ebb0..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/pulldown.h.orig Sun Aug 10 01:33:14 2003 -+++ src/post/deinterlace/pulldown.h Sun Aug 10 01:33:24 2003 -@@ -22,7 +22,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - #include "speedy.h" - diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h b/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h deleted file mode 100644 index 1a50da63b785..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/speedy.h.orig Sun Aug 10 01:07:07 2003 -+++ src/post/deinterlace/speedy.h Sun Aug 10 01:20:18 2003 -@@ -22,7 +22,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - - #ifdef __cplusplus diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c b/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c deleted file mode 100644 index d312b2b750be..000000000000 --- a/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/post/deinterlace/tvtime.c.orig Sun Aug 10 01:34:07 2003 -+++ src/post/deinterlace/tvtime.c Sun Aug 10 01:34:32 2003 -@@ -25,7 +25,11 @@ - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - #else --# include <stdint.h> -+# if defined(HAVE_STDINT_H) -+# include <stdint.h> -+# else -+# include <inttypes.h> -+# endif - #endif - #include "speedy.h" - #include "deinterlace.h" diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist index 82c80d71bf48..7a4a48bcb236 100644 --- a/multimedia/libxine/pkg-plist +++ b/multimedia/libxine/pkg-plist @@ -8,6 +8,7 @@ include/xine/buffer.h include/xine/compat.h include/xine/configfile.h include/xine/demux.h +include/xine/info_helper.h include/xine/input_plugin.h include/xine/io_helper.h include/xine/metronom.h @@ -30,13 +31,21 @@ include/xine/xineutils.h include/xine/xmllexer.h include/xine/xmlparser.h lib/libxine.so -lib/libxine.so.7 +lib/libxine.so.8 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so lib/xine/plugins/1.0.0/post/xineplug_post_planar.so lib/xine/plugins/1.0.0/post/xineplug_post_switch.so lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.so lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/cyberblade_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/mach64_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/mga_crtc2_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/mga_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/pm2_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/pm3_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/radeon_vid.so +%%VIDIX%%lib/xine/plugins/1.0.0/vidix/rage128_vid.so %%HAVE_ARTS%%lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so %%HAVE_ESOUND%%lib/xine/plugins/1.0.0/xineplug_ao_out_esd.so lib/xine/plugins/1.0.0/xineplug_ao_out_none.so @@ -119,13 +128,16 @@ lib/xine/plugins/1.0.0/xineplug_inp_rtp.so lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so lib/xine/plugins/1.0.0/xineplug_inp_vcd.so +lib/xine/plugins/1.0.0/xineplug_inp_vcdo.so lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so lib/xine/plugins/1.0.0/xineplug_vo_out_none.so -lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so +%%PGX64%%lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so -%%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so +%%VIDIX%%lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.so lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so +%%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so +%%XVMC%%lib/xine/plugins/1.0.0/xineplug_vo_out_xvmc.so libdata/pkgconfig/libxine.pc share/aclocal/xine.m4 share/doc/xine/README @@ -135,16 +147,16 @@ share/doc/xine/README.dxr3 share/doc/xine/README.dxr3_pl share/doc/xine/README.freebsd share/doc/xine/README.irix -share/doc/xine/README.mrl share/doc/xine/README.network_dvd share/doc/xine/README.opengl -share/doc/xine/README.plugins share/doc/xine/README.solaris share/doc/xine/README.syncfb -share/doc/xine/README.tvmode -share/doc/xine/dataflow.dia share/doc/xine/faq/faq.html share/doc/xine/faq/faq.txt +share/doc/xine/hackersguide/architecture.png +share/doc/xine/hackersguide/hackersguide.html +share/doc/xine/hackersguide/library.png +share/doc/xine/hackersguide/overlays.png share/locale/cs/LC_MESSAGES/libxine1.mo share/locale/de/LC_MESSAGES/libxine1.mo share/locale/es/LC_MESSAGES/libxine1.mo @@ -188,6 +200,7 @@ share/xine/libxine1/fonts/serif-32.xinefont.gz @dirrm lib/xine/plugins @dirrm lib/xine @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true +@dirrm share/doc/xine/hackersguide @dirrm share/doc/xine/faq @dirrm share/doc/xine @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true |