public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gst-plugins10.eclass
@ 2012-10-31  1:51 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-10-31  1:51 UTC (permalink / raw
  To: gentoo-commits

tetromino    12/10/31 01:51:52

  Modified:             ChangeLog gst-plugins10.eclass
  Log:
  Use versionator to slot gst-1.0 plugins.

Revision  Changes    Path
1.489                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.489&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.489&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.488&r2=1.489

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- ChangeLog	30 Oct 2012 21:56:31 -0000	1.488
+++ ChangeLog	31 Oct 2012 01:51:52 -0000	1.489
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.488 2012/10/30 21:56:31 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.489 2012/10/31 01:51:52 tetromino Exp $
+
+  31 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gst-plugins10.eclass:
+  Use versionator to slot gst-1.0 plugins.
 
   30 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd.eclass:
   Add systemd_with_utildir() as well.



1.7                  eclass/gst-plugins10.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?r1=1.6&r2=1.7

Index: gst-plugins10.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gst-plugins10.eclass	27 Dec 2011 17:55:12 -0000	1.6
+++ gst-plugins10.eclass	31 Oct 2012 01:51:52 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.6 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.7 2012/10/31 01:51:52 tetromino Exp $
 
 # Author : foser <foser@gentoo.org>
 
@@ -14,7 +14,7 @@
 # Gentoo developers responsible for gstreamer <gstreamer@gentoo.org> or the application
 # developer.
 
-inherit eutils
+inherit eutils versionator
 
 
 ###
@@ -24,7 +24,7 @@
 # Create a major/minor combo for our SLOT and executables suffix
 PVP=(${PV//[-\._]/ })
 #PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
-PV_MAJ_MIN=0.10
+PV_MAJ_MIN=$(get_version_component_range '1-2')
 
 # Extract the plugin to build from the ebuild name
 # May be set by an ebuild and contain more than one indentifier, space seperated





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gst-plugins10.eclass
@ 2013-01-31 19:59 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2013-01-31 19:59 UTC (permalink / raw
  To: gentoo-commits

eva         13/01/31 19:59:55

  Modified:             ChangeLog gst-plugins10.eclass
  Log:
  Allow build of multiple plugins in different directories. Make variables more easily override-able.

Revision  Changes    Path
1.657                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.657&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.657&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.656&r2=1.657

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -r1.656 -r1.657
--- ChangeLog	31 Jan 2013 14:12:12 -0000	1.656
+++ ChangeLog	31 Jan 2013 19:59:54 -0000	1.657
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.656 2013/01/31 14:12:12 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.657 2013/01/31 19:59:54 eva Exp $
+
+  31 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass:
+  Allow build of multiple plugins in different directories. Make variables more
+  easily override-able.
 
   31 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xorg-2.eclass:



1.10                 eclass/gst-plugins10.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?r1=1.9&r2=1.10

Index: gst-plugins10.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gst-plugins10.eclass	16 Jan 2013 22:52:37 -0000	1.9
+++ gst-plugins10.eclass	31 Jan 2013 19:59:54 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.9 2013/01/16 22:52:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.10 2013/01/31 19:59:54 eva Exp $
 
 # @ECLASS: gst-plugins10.eclass
 # @MAINTAINER:
@@ -58,13 +58,13 @@
 # Defines the plugins to be built.
 # May be set by an ebuild and contain more than one indentifier, space
 # seperated (only src_configure can handle mutiple plugins at this time).
-GST_PLUGINS_BUILD=${PN/gst-plugins-/}
+: ${GST_PLUGINS_BUILD:=${PN/gst-plugins-/}}
 
 # @ECLASS-VARIABLE: GST_PLUGINS_BUILD_DIR
 # @DESCRIPTION:
 # Actual build directory of the plugin.
 # Most often the same as the configure switch name.
-GST_PLUGINS_BUILD_DIR=${PN/gst-plugins-/}
+: ${GST_PLUGINS_BUILD_DIR:=${PN/gst-plugins-/}}
 
 # @ECLASS-VARIABLE: GST_TARBALL_SUFFIX
 # @DESCRIPTION:
@@ -142,20 +142,24 @@
 }
 
 # @FUNCTION: gst-plugins10_find_plugin_dir
+# @USAGE: gst-plugins10_find_plugin_dir [<build_dir>]
 # @INTERNAL
 # @DESCRIPTION:
 # Finds plugin build directory and cd to it.
+# Defaults to ${GST_PLUGINS_BUILD_DIR} if argument is not provided
 gst-plugins10_find_plugin_dir() {
-	if [[ ! -d ${S}/ext/${GST_PLUGINS_BUILD_DIR} ]]; then
-		if [[ ! -d ${S}/sys/${GST_PLUGINS_BUILD_DIR} ]]; then
+	local build_dir=${1:-${GST_PLUGINS_BUILD_DIR}}
+
+	if [[ ! -d ${S}/ext/${build_dir} ]]; then
+		if [[ ! -d ${S}/sys/${build_dir} ]]; then
 			ewarn "No such plugin directory"
 			die
 		fi
-		einfo "Building system plugin ${GST_PLUGINS_BUILD_DIR} ..."
-		cd "${S}"/sys/${GST_PLUGINS_BUILD_DIR}
+		einfo "Building system plugin in ${build_dir}..."
+		cd "${S}"/sys/${build_dir}
 	else
-		einfo "Building external plugin ${GST_PLUGINS_BUILD_DIR} ..."
-		cd "${S}"/ext/${GST_PLUGINS_BUILD_DIR}
+		einfo "Building external plugin in ${build_dir}..."
+		cd "${S}"/ext/${build_dir}
 	fi
 }
 
@@ -171,15 +175,16 @@
 	local directory libs pkgconfig pc tuple
 	pkgconfig=$(tc-getPKG_CONFIG)
 
-	gst-plugins10_find_plugin_dir
-
-	for tuple in $@ ; do
-		directory="$(echo ${tuple} | cut -f1 -d':')"
-		pc="$(echo ${tuple} | cut -f2 -d':')-${SLOT}"
-		libs="$(${pkgconfig} --libs-only-l ${pc})"
+	for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do
+		gst-plugins10_find_plugin_dir ${plugin_dir}
 
-		sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
-			-i Makefile.am Makefile.in || die
+		for tuple in $@ ; do
+			directory="$(echo ${tuple} | cut -f1 -d':')"
+			pc="$(echo ${tuple} | cut -f2 -d':')-${SLOT}"
+			libs="$(${pkgconfig} --libs-only-l ${pc})"
+			sed -e "s:\$(top_builddir)/${directory}/.*\.la:${libs}:" \
+				-i Makefile.am Makefile.in || die
+		done
 	done
 }
 
@@ -253,29 +258,37 @@
 # @DESCRIPTION:
 # Compiles requested gstreamer plugin.
 gst-plugins10_src_compile() {
+	local plugin_dir
+	
 	has ${EAPI:-0} 0 1 && gst-plugins10_src_configure "$@"
 
-	gst-plugins10_find_plugin_dir
+	for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do
+		gst-plugins10_find_plugin_dir ${plugin_dir}
 
-	if has "${EAPI:-0}" 0 1 2 3 ; then
-		emake || die
-	else
-		default
-	fi
+		if has "${EAPI:-0}" 0 1 2 3 ; then
+			emake || die
+		else
+			default
+		fi
+	done
 }
 
 # @FUNCTION: gst-plugins10_src_install
 # @DESCRIPTION:
 # Installs requested gstreamer plugin.
 gst-plugins10_src_install() {
-	gst-plugins10_find_plugin_dir
-
-	if has "${EAPI:-0}" 0 1 2 3 ; then
-		emake install DESTDIR="${D}" || die
-		[[ -e README ]] && dodoc README
-	else
-		default
-	fi
+	local plugin_dir
+	
+	for plugin_dir in ${GST_PLUGINS_BUILD_DIR} ; do
+		gst-plugins10_find_plugin_dir ${plugin_dir}
+
+		if has "${EAPI:-0}" 0 1 2 3 ; then
+			emake install DESTDIR="${D}" || die
+			[[ -e README ]] && dodoc README
+		else
+			default
+		fi
+	done
 
 	[[ ${GST_LA_PUNT} = "yes" ]] && prune_libtool_files --modules
 }





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gst-plugins10.eclass
@ 2013-09-29 17:47 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2013-09-29 17:47 UTC (permalink / raw
  To: gentoo-commits

eva         13/09/29 17:47:13

  Modified:             ChangeLog gst-plugins10.eclass
  Log:
  Add support for gstreamer 1.2 release series.

Revision  Changes    Path
1.999                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.999&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.999&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.998&r2=1.999

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -r1.998 -r1.999
--- ChangeLog	29 Sep 2013 15:04:51 -0000	1.998
+++ ChangeLog	29 Sep 2013 17:47:13 -0000	1.999
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.998 2013/09/29 15:04:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.999 2013/09/29 17:47:13 eva Exp $
+
+  29 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org> gst-plugins10.eclass:
+  Add support for gstreamer 1.2 release series.
 
   29 Sep 2013; Michał Górny <mgorny@gentoo.org> python-distutils-ng.eclass:
   Last rite python-distutils-ng.



1.11                 eclass/gst-plugins10.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?r1=1.10&r2=1.11

Index: gst-plugins10.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gst-plugins10.eclass	31 Jan 2013 19:59:54 -0000	1.10
+++ gst-plugins10.eclass	29 Sep 2013 17:47:13 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.10 2013/01/31 19:59:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.11 2013/09/29 17:47:13 eva Exp $
 
 # @ECLASS: gst-plugins10.eclass
 # @MAINTAINER:
@@ -102,7 +102,11 @@
 SRC_URI="http://gstreamer.freedesktop.org/src/${GST_ORG_MODULE}/${GST_ORG_MODULE}-${PV}.tar.${GST_TARBALL_SUFFIX}"
 
 LICENSE="GPL-2"
-SLOT="${GST_ORG_PVP}"
+case ${GST_ORG_PVP} in
+	0.10) SLOT="0.10" ;;
+	1.*) SLOT="1.0" ;;
+	*) die "Unkown gstreamer release."
+esac
 
 S="${WORKDIR}/${GST_ORG_MODULE}-${PV}"
 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gst-plugins10.eclass
@ 2014-04-05  9:19 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2014-04-05  9:19 UTC (permalink / raw
  To: gentoo-commits

tetromino    14/04/05 09:19:19

  Modified:             ChangeLog gst-plugins10.eclass
  Log:
  Use LC_ALL=C for tr call; fixes invalid configure options when using Turkish locale (bug #490894, thanks to Emre Eryilmaz and Samuli Suominen).

Revision  Changes    Path
1.1196               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1196&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1196&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1195&r2=1.1196

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -u -r1.1195 -r1.1196
--- ChangeLog	3 Apr 2014 22:09:36 -0000	1.1195
+++ ChangeLog	5 Apr 2014 09:19:19 -0000	1.1196
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1195 2014/04/03 22:09:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1196 2014/04/05 09:19:19 tetromino Exp $
+
+  05 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gst-plugins10.eclass:
+  Use LC_ALL=C for tr call; fixes invalid configure options when using Turkish
+  locale (bug #490894, thanks to Emre Eryilmaz and Samuli Suominen).
 
   03 Apr 2014; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass,
   cmake-multilib.eclass, multilib-build.eclass:



1.12                 eclass/gst-plugins10.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gst-plugins10.eclass?r1=1.11&r2=1.12

Index: gst-plugins10.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gst-plugins10.eclass	29 Sep 2013 17:47:13 -0000	1.11
+++ gst-plugins10.eclass	5 Apr 2014 09:19:19 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.11 2013/09/29 17:47:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins10.eclass,v 1.12 2014/04/05 09:19:19 tetromino Exp $
 
 # @ECLASS: gst-plugins10.eclass
 # @MAINTAINER:
@@ -142,7 +142,7 @@
 gst-plugins10_get_plugins() {
 	# Must be called from src_prepare/src_configure
 	GST_PLUGINS_LIST=$(sed -rn 's/^AG_GST_CHECK_FEATURE\((\w+),.*/ \1 /p' \
-		"${S}"/configure.* | tr '[:upper:]' '[:lower:]')
+		"${S}"/configure.* | LC_ALL='C' tr '[:upper:]' '[:lower:]')
 }
 
 # @FUNCTION: gst-plugins10_find_plugin_dir





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-04-05  9:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-31 19:59 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gst-plugins10.eclass Gilles Dartiguelongue (eva)
  -- strict thread matches above, loose matches on Subject: below --
2014-04-05  9:19 Alexandre Rostovtsev (tetromino)
2013-09-29 17:47 Gilles Dartiguelongue (eva)
2012-10-31  1:51 Alexandre Rostovtsev (tetromino)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox