23245481 Move libvisual 0.4.0 to Userland
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Wed, 16 Nov 2016 18:50:33 -0800
changeset 7328 196e5438a14f
parent 7327 9c5f2a8218bc
child 7329 64b0ecdb0e74
23245481 Move libvisual 0.4.0 to Userland
components/desktop/libvisual/Makefile
components/desktop/libvisual/libvisual.p5m
components/desktop/libvisual/patches/libvisual-01-solaris.patch
components/desktop/libvisual/patches/libvisual-02-map.patch
components/desktop/libvisual/patches/libvisual-03-amd64.patch
components/desktop/libvisual/patches/libvisual-04-locale.patch
components/meta-packages/incorporation-cache
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/Makefile	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		32_and_64
+COMPILER=		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		libvisual
+COMPONENT_VERSION=	0.4.0
+COMPONENT_PROJECT_URL=	https://sourceforge.net/projects/libvisual
+COMPONENT_ARCHIVE_HASH= \
+	sha256:0b4dfdb87125e129567752089e3c8b54cefed601eef169d2533d8659da8dc1d7
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/files/$(COMPONENT_NAME)/$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/multimedia
+
+TPNO=	 		9463
+
+TEST_TARGET = $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/common.mk
+
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
+COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
+
+REQUIRED_PACKAGES += system/library/math
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/libvisual.p5m	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,95 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/library/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Libvisual provides a convenient API for writing visualization plugins"
+set name=com.oracle.info.description value=libvisual
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Multimedia Libraries"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2010/143
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/libvisual-0.4/libvisual/libvisual.h
+file path=usr/include/libvisual-0.4/libvisual/lv_actor.h
+file path=usr/include/libvisual-0.4/libvisual/lv_audio.h
+file path=usr/include/libvisual-0.4/libvisual/lv_bin.h
+file path=usr/include/libvisual-0.4/libvisual/lv_bits.h
+file path=usr/include/libvisual-0.4/libvisual/lv_bmp.h
+file path=usr/include/libvisual-0.4/libvisual/lv_buffer.h
+file path=usr/include/libvisual-0.4/libvisual/lv_cache.h
+file path=usr/include/libvisual-0.4/libvisual/lv_collection.h
+file path=usr/include/libvisual-0.4/libvisual/lv_color.h
+file path=usr/include/libvisual-0.4/libvisual/lv_common.h
+file path=usr/include/libvisual-0.4/libvisual/lv_config.h
+file path=usr/include/libvisual-0.4/libvisual/lv_cpu.h
+file path=usr/include/libvisual-0.4/libvisual/lv_defines.h
+file path=usr/include/libvisual-0.4/libvisual/lv_error.h
+file path=usr/include/libvisual-0.4/libvisual/lv_event.h
+file path=usr/include/libvisual-0.4/libvisual/lv_fourier.h
+file path=usr/include/libvisual-0.4/libvisual/lv_gl.h
+file path=usr/include/libvisual-0.4/libvisual/lv_hashlist.h
+file path=usr/include/libvisual-0.4/libvisual/lv_hashmap.h
+file path=usr/include/libvisual-0.4/libvisual/lv_input.h
+file path=usr/include/libvisual-0.4/libvisual/lv_keysym.h
+file path=usr/include/libvisual-0.4/libvisual/lv_libvisual.h
+file path=usr/include/libvisual-0.4/libvisual/lv_list.h
+file path=usr/include/libvisual-0.4/libvisual/lv_log.h
+file path=usr/include/libvisual-0.4/libvisual/lv_math.h
+file path=usr/include/libvisual-0.4/libvisual/lv_mem.h
+file path=usr/include/libvisual-0.4/libvisual/lv_morph.h
+file path=usr/include/libvisual-0.4/libvisual/lv_object.h
+file path=usr/include/libvisual-0.4/libvisual/lv_os.h
+file path=usr/include/libvisual-0.4/libvisual/lv_palette.h
+file path=usr/include/libvisual-0.4/libvisual/lv_param.h
+file path=usr/include/libvisual-0.4/libvisual/lv_plugin.h
+file path=usr/include/libvisual-0.4/libvisual/lv_random.h
+file path=usr/include/libvisual-0.4/libvisual/lv_rectangle.h
+file path=usr/include/libvisual-0.4/libvisual/lv_ringbuffer.h
+file path=usr/include/libvisual-0.4/libvisual/lv_songinfo.h
+file path=usr/include/libvisual-0.4/libvisual/lv_thread.h
+file path=usr/include/libvisual-0.4/libvisual/lv_time.h
+file path=usr/include/libvisual-0.4/libvisual/lv_transform.h
+file path=usr/include/libvisual-0.4/libvisual/lv_types.h
+file path=usr/include/libvisual-0.4/libvisual/lv_ui.h
+file path=usr/include/libvisual-0.4/libvisual/lv_utils.h
+file path=usr/include/libvisual-0.4/libvisual/lv_video.h
+file path=usr/include/libvisual-0.4/libvisual/lvconfig.h
+link path=usr/lib/$(MACH64)/libvisual-0.4.so target=libvisual-0.4.so.0.0.0
+link path=usr/lib/$(MACH64)/libvisual-0.4.so.0 target=libvisual-0.4.so.0.0.0
+file path=usr/lib/$(MACH64)/libvisual-0.4.so.0.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/libvisual-0.4.pc
+link path=usr/lib/libvisual-0.4.so target=libvisual-0.4.so.0.0.0
+link path=usr/lib/libvisual-0.4.so.0 target=libvisual-0.4.so.0.0.0
+file path=usr/lib/libvisual-0.4.so.0.0.0
+file path=usr/lib/pkgconfig/libvisual-0.4.pc
+file path=usr/share/locale/es_AR/LC_MESSAGES/libvisual-0.4.mo
+file path=usr/share/locale/es_ES/LC_MESSAGES/libvisual-0.4.mo
+license COPYING license=LGPLv2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/patches/libvisual-01-solaris.patch	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,57 @@
+Patch migrated from desktop gate, where it was listed as:
+# date:2008-11-25 owner:wangke type:branding
+Patch1:                 libvisual-01-solaris.diff
+
+Since this is for our build, probably not something we can get upstream.
+
+--- libvisual-0.4.0/libvisual/lv_types.h	Tue Feb 14 04:54:08 2006
++++ libvisual-0.4.0/libvisual/lv_types.h	Tue Nov 25 14:15:26 2008
[email protected]@ -30,6 +30,11 @@
+ #include <stdint.h>
+ #else
+ #include <sys/types.h>
++
++#if defined(__sun__) || defined(__sun)
++#include <inttypes.h>
++#endif
++
+ #endif /* !VISUAL_OS_WIN32 */
+ 
+ VISUAL_BEGIN_DECLS
[email protected]@ -38,7 +43,7 @@
+ 
+ #define VISUAL_TABLESIZE(table)			(sizeof (table) / sizeof (table[0]))
+ 
+-#if !defined(VISUAL_OS_WIN32)
++#if !defined(VISUAL_OS_WIN32) && !defined(__sun__) && !defined(__sun)
+ #ifndef uint8_t
+ #define uint8_t		u_int8_t
+ #endif
[email protected]@ -50,7 +55,7 @@
+ #ifndef uint32_t
+ #define uint32_t	u_int32_t
+ #endif
+-#endif /* !VISUAL_OS_WIN32 */
++#endif /* !VISUAL_OS_WIN32 && !__sun__ && !__sun */
+ 
+ VISUAL_END_DECLS
+ 
+--- libvisual-0.4.0/configure.ac  2010-04-22 14:25:31.689386300 +0100
++++ libvisual-0.4.0/configure.ac       2010-04-22 14:27:22.487439900 +0100
[email protected]@ -24,6 +24,8 @@
+ 
+ AC_CANONICAL_HOST
+ 
++AC_PROG_CC
++
+ lv_mips=no
+ lv_alpha=no
+ lv_sparc=no
[email protected]@ -104,7 +106,6 @@
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+-AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/patches/libvisual-02-map.patch	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,19 @@
+Patch migrated from desktop gate, where it was listed as:
+# date:2008-12-07 owner:wangke type:feature bugster:6788530
+Patch2:                 libvisual-02-map.diff
+
+which corresponds to:
+Bug 15532087 - SUNBT6788530-SOLARIS_11 [nevada][nightly] gnome-settings-daemon
+ does not start on login due to libvisual
+
+Since this is for our build, probably not something we can get upstream.
+
+
+--- libvisual-0.4.0/libvisual/map.remove_all	1970-01-01 08:00:00.000000000 +0800
++++ libvisual-0.4.0/libvisual/map.remove_all	2009-01-07 11:44:41.487159000 +0800
[email protected]@ -0,0 +1 @@
++hwcap_1 = OVERRIDE;
+--- libvisual-0.4.0/map.remove_all	1970-01-01 08:00:00.000000000 +0800
++++ libvisual-0.4.0/map.remove_all	2009-01-19 14:00:20.369036000 +0800
[email protected]@ -0,0 +1 @@
++hwcap_1 = OVERRIDE;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/patches/libvisual-03-amd64.patch	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,50 @@
+Patch migrated from desktop gate, where it was listed as:
+# date:2010-04-13 owner:wangke type:bug bugid:2986859
+Patch3:                 libvisual-03-amd64.diff
+
+which appears to correspond to:
+http://sourceforge.net/support/tracker.php?aid=2986859
+aka:
+https://sourceforge.net/p/libvisual/bugs/13/
+
+which was closed as invalid since upstream converted from autoconf to cmake.
+
+Need to determine if this is still needed with cmake, and if so how to convert
+to send upstream.
+
+--- libvisual-0.4.0/configure.ac	2010-04-16 09:56:44.322927624 -0500
++++ libvisual-0.4.0/configure.ac	2010-04-16 09:55:19.191320318 -0500
[email protected]@ -35,7 +35,24 @@ case "$host_cpu" in
+ 	mips)           lv_mips=yes;;
+ 	alpha)          lv_alpha=yes;;
+ 	sparc)          lv_sparc=yes;;
+-	i*86)           lv_ix86=yes;;
++	i*86)
++          case $host_os in
++            solaris*)
++              AC_CHECK_DECL([__i386], [I386_ABI="yes"], [I386_ABI="no"])
++              AC_CHECK_DECL([__amd64], [AMD64_ABI="yes"], [AMD64_ABI="no"])
++
++              if test "x$I386_ABI" = "xyes" ; then
++                lv_ix86=yes
++              fi
++              if test "x$AMD64_ABI" = "xyes" ; then
++                lv_x86_64=yes
++              fi
++              ;;
++            *)
++              lv_ix86=yes
++              ;;
++          esac
++          ;;
+ 	x86_64*)	lv_x86_64=yes;;
+        	powerpc|ppc)    lv_powerpc=yes;;
+ 	*)		lv_arch_unknown=yes;;
[email protected]@ -780,6 +797,7 @@ echo >>$outfile
+    lv_alpha=$lv_alpha
+    lv_sparc=$lv_sparc
+    lv_ix86=$lv_ix86
++   lv_x86_64=$lv_x86_64
+    lv_powerpc=$lv_powerpc
+    lv_arch_unknown=$lv_arch_unknown
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/libvisual/patches/libvisual-04-locale.patch	Wed Nov 16 18:50:33 2016 -0800
@@ -0,0 +1,14 @@
+Workaround autoreconf removing the setting of $(GETTEXT_PACKAGE) in
+libvisual-0.4.0/po/Makefile.in.in
+
+--- libvisual-0.4.0/po/Makevars	2016-10-07 10:52:34.532032488 -0700
++++ libvisual-0.4.0/po/Makevars	2016-10-07 10:52:48.854073483 -0700
[email protected]@ -1,7 +1,7 @@
+ # Makefile variables for PO directory in any package using GNU gettext.
+ 
+ # Usually the message domain is the same as the package name.
+-DOMAIN = $(GETTEXT_PACKAGE)
++DOMAIN = libvisual-0.4
+ 
+ # These two variables depend on the location of this directory.
+ subdir = po
--- a/components/meta-packages/incorporation-cache	Wed Nov 16 18:50:18 2016 -0800
+++ b/components/meta-packages/incorporation-cache	Wed Nov 16 18:50:33 2016 -0800
@@ -49,7 +49,6 @@
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]