Hello community, here is the log from the commit of package libGLw for openSUSE:Factory checked in at 2016-03-29 14:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libGLw (Old) and /work/SRC/openSUSE:Factory/.libGLw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libGLw" Changes: -------- --- /work/SRC/openSUSE:Factory/libGLw/libGLw.changes 2015-01-30 17:50:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libGLw.new/libGLw.changes 2016-03-29 14:50:36.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Mar 19 20:18:54 UTC 2016 - [email protected] + +- Consolidate building of libGLw for Xt and Motif. + +------------------------------------------------------------------- +Wed Mar 16 18:15:24 UTC 2016 - [email protected] + +- n_Use-newly-introduced-GLAPIVAR-for-variables.patch + Use newly introduced GLAPIVAR instead of GLAPI for + variable declarations. This adds an 'extern' in cases + where GLAPI doesn't have one and avoids a variable + declarartion to become a definition (bsc#970725). + +------------------------------------------------------------------- New: ---- n_Use-newly-introduced-GLAPIVAR-for-variables.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libGLw.spec ++++++ --- /var/tmp/diff_new_pack.aQxIWb/_old 2016-03-29 14:50:37.000000000 +0200 +++ /var/tmp/diff_new_pack.aQxIWb/_new 2016-03-29 14:50:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libGLw # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,21 @@ # +%if 0%{?suse_version} > 1310 +%define use_motif 1 +%else +%define use_motif 0 +%endif +%define libversion 1 + Name: libGLw # Needs to be set in buildservice project, see 'osc meta prjconf X11:XOrg' # for an example -%if 0%{?use_motif} > 0 -%define lname libGLwM1 +%if 0%{?use_motif} != 0 +%define lname_m libGLwM%{libversion} BuildRequires: openmotif-devel -%else -%define lname libGLw1 %endif +%define lname libGLw%{libversion} BuildRequires: pkgconfig BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(x11) @@ -40,6 +46,7 @@ Group: Development/Libraries/C and C++ Source: glw-%{version}_%{date}_%{sha1}.tar.bz2 Source1: baselibs.conf +Patch1: n_Use-newly-introduced-GLAPIVAR-for-variables.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,57 +59,69 @@ Brian Paul %package -n %lname -Summary: Xt/Motif OpenGL drawing area widget library +Summary: Xt OpenGL drawing area widget library Group: System/Libraries # O/P added in 12.2 -Provides: GLw1 = %version-%release +Provides: GLw%{libversion} = %version-%release Provides: MesaGLw = %version-%release Obsoletes: MesaGLw < %version-%release -%if 0%{?use_motif} > 0 -Provides: libGLw1 = %version-%release -Obsoletes: libGLw1 < %version-%release -%endif +Conflicts: libGLwM%{libversion} %description -n %lname -Xt/Motif OpenGL drawing area widget library shipped by the Mesa Project. +Xt OpenGL drawing area widget library shipped by the Mesa Project. %package devel -%if 0%{?use_motif} > 0 -Requires: libGLwM1 = %version -%else -Requires: libGLw1 = %version -%endif +Requires: GLw%{libversion} = %version Requires: pkgconfig(gl) -Summary: Libraries, includes and more to develop MesaGLw applications +Summary: Includes and more to develop MesaGLw applications Group: Development/Libraries/C and C++ -Provides: Mesa-devel:%{_libdir}/libGLw.so %description devel -This package contains all necessary include files and libraries needed +This package contains all necessary include files needed to develop applications that require these. +%if 0%{?use_motif} != 0 +%package -n %lname_m +Summary: Motif OpenGL drawing area widget library +Group: System/Libraries +# O/P added in 12.2 +Provides: GLw%{libversion} = %version-%release +Provides: MesaGLw = %version-%release +Obsoletes: MesaGLw < %version-%release +Conflicts: libGLw%{libversion} +Requires: openmotif -Authors: --------- - Brian Paul +%description -n %lname_m +Motif OpenGL drawing area widget library shipped by the Mesa Project. + +%endif %prep %setup -q -n glw-%{version} +%patch1 -p1 %build -%if 0%{?use_motif} > 0 -%configure --enable-motif -%else -%configure +%__mkdir build-GLw; cd build-GLw; %{__ln_s} -f ../configure +%{configure} --srcdir=../ +%__make %{?_smp_mflags} OPT_FLAGS="$RPM_OPT_FLAGS" +%if 0%{?use_motif} != 0 +%__mkdir ../build-GLwM; cd ../build-GLwM; %{__ln_s} -f ../configure +%{configure} --srcdir=../ --enable-motif +%__make %{?_smp_mflags} OPT_FLAGS="$RPM_OPT_FLAGS" %endif -make %{?_smp_mflags} OPT_FLAGS="$RPM_OPT_FLAGS" %install -mkdir -p $RPM_BUILD_ROOT%{_libdir} \ - $RPM_BUILD_ROOT/usr/include/GL -cp -a .libs/libGLw.so* $RPM_BUILD_ROOT%{_libdir} -install -m 644 *.h $RPM_BUILD_ROOT/usr/include/GL +%if 0%{?use_motif} != 0 +cd build-GLwM +DESTDIR=$RPM_BUILD_ROOT %__make install +i=$(echo $RPM_BUILD_ROOT%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwM.so}; +cd .. +%endif +cd build-GLw +DESTDIR=$RPM_BUILD_ROOT %__make install +i=$(echo $RPM_BUILD_ROOT%{_libdir}/libGLw.so.*.*.*); mv $i ${i/libGLw.so/libGLwXT.so}; +rm -f $RPM_BUILD_ROOT/%{_libdir}/libGLw.la $RPM_BUILD_ROOT/%{_libdir}/libGLw.a $RPM_BUILD_ROOT/%{_libdir}/libGLw.so.? $RPM_BUILD_ROOT/%{_libdir}/libGLw.so %post -n %lname -p /sbin/ldconfig @@ -111,11 +130,33 @@ %files -n %lname %defattr(-,root,root) %doc README -%{_libdir}/libGLw.so.1* +%{_libdir}/libGLwXT.so.* %files devel %defattr(-,root,root) /usr/include/GL -%{_libdir}/libGLw.so +%{_libdir}/pkgconfig/glw.pc + +%post devel +ln -sf $(readlink %{_libdir}/libGLw.so.%{libversion}) %{_libdir}/libGLw.so + +%preun devel + [ $1 -eq 0 ] && rm -f %{_libdir}/libGLw.so || true + +%if 0%{?use_motif} != 0 + +%post -n %lname_m -p /sbin/ldconfig + +%postun -n %lname_m -p /sbin/ldconfig + +%files -n %lname_m +%defattr(-,root,root) +%doc README +%{_libdir}/libGLwM.so.1* + +%endif + +%clean +rm -rf build-GLwM build-GLw %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.aQxIWb/_old 2016-03-29 14:50:37.000000000 +0200 +++ /var/tmp/diff_new_pack.aQxIWb/_new 2016-03-29 14:50:37.000000000 +0200 @@ -3,6 +3,5 @@ requires -libGLw-<targettype> requires "libGLw1-<targettype> = <version>" libGLwM1 -libGLwM-devel requires -libGLwM-<targettype> requires "libGLwM1-<targettype> = <version>" ++++++ n_Use-newly-introduced-GLAPIVAR-for-variables.patch ++++++ From: Egbert Eich <[email protected]> Date: Fri Mar 11 14:04:00 2016 +0100 Subject: [PATCH]Use newly introduced GLAPIVAR for variables Patch-mainline: never Git-commit: 7fe20b98de84fad7330cb509cb50a39a390c7314 References: bsc# Signed-off-by: Egbert Eich <[email protected]> GLAPI doesn't have an 'extern' in some circumstances. This way, variable declarations become definitions. Signed-off-by: Egbert Eich <[email protected]> --- GLwDrawA.h | 4 ++-- GLwDrawAP.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GLwDrawA.h b/GLwDrawA.h index b9711c2..db4be24 100644 --- a/GLwDrawA.h +++ b/GLwDrawA.h @@ -136,7 +136,7 @@ typedef struct _GLwMDrawingAreaClassRec *GLwMDrawingAreaWidgetClass; typedef struct _GLwMDrawingAreaRec *GLwMDrawingAreaWidget; -GLAPI WidgetClass glwMDrawingAreaWidgetClass; +GLAPIVAR WidgetClass glwMDrawingAreaWidgetClass; #else @@ -144,7 +144,7 @@ GLAPI WidgetClass glwMDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaClassRec *GLwDrawingAreaWidgetClass; typedef struct _GLwDrawingAreaRec *GLwDrawingAreaWidget; -GLAPI WidgetClass glwDrawingAreaWidgetClass; +GLAPIVAR WidgetClass glwDrawingAreaWidgetClass; #endif diff --git a/GLwDrawAP.h b/GLwDrawAP.h index 4ff21b4..6d29849 100644 --- a/GLwDrawAP.h +++ b/GLwDrawAP.h @@ -59,7 +59,7 @@ typedef struct _GLwMDrawingAreaClassRec { } GLwMDrawingAreaClassRec; -GLAPI GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; +GLAPIVAR GLwMDrawingAreaClassRec glwMDrawingAreaClassRec; /* XT */ @@ -70,7 +70,7 @@ typedef struct _GLwDrawingAreaClassRec { GLwDrawingAreaClassPart glwDrawingArea_class; } GLwDrawingAreaClassRec; -GLAPI GLwDrawingAreaClassRec glwDrawingAreaClassRec; +GLAPIVAR GLwDrawingAreaClassRec glwDrawingAreaClassRec; #endif
