Attachment 116728 Details for Bug 158721 – patch-sfml.txt

[patch] patch-sfml.txt

patch-sfml.txt (text/plain), 7.66 KB, created by Ganael LAPLANCHE on 2011-07-21 13:54:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2011-07-21 13:54:13 UTC

Size: 7.66 KB

patch

obsolete

>diff -aurN sfml.orig/Makefile sfml/Makefile
>--- sfml.orig/Makefile	2011-07-21 13:43:36.557332712 +0200
>+++ sfml/Makefile	2011-07-21 14:24:59.420197127 +0200
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	sfml
> PORTVERSION=	1.6
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF
> DISTNAME=	SFML-${PORTVERSION}-sdk-linux-32
>diff -aurN sfml.orig/files/patch-src-SFML-Audio-Makefile sfml/files/patch-src-SFML-Audio-Makefile
>--- sfml.orig/files/patch-src-SFML-Audio-Makefile	2011-07-21 13:43:36.545332863 +0200
>+++ sfml/files/patch-src-SFML-Audio-Makefile	2011-07-21 14:25:28.508967627 +0200
>@@ -1,6 +1,16 @@
>---- src/SFML/Audio/Makefile.orig	2009-05-28 19:57:04.000000000 +0400
>-+++ src/SFML/Audio/Makefile	2009-07-07 19:51:57.000000000 +0400
>-@@ -19,13 +19,13 @@
>+--- src/SFML/Audio/Makefile.orig	2010-01-27 15:00:19.000000000 +0100
>++++ src/SFML/Audio/Makefile	2011-07-07 18:10:38.318404815 +0200
>+@@ -10,7 +10,8 @@
>+ else
>+     LIB     = libsfml-audio.so
>+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
>+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
>++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
>++              && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
>+ endif
>+ 
>+ all: $(LIB)
>+@@ -19,13 +20,13 @@
>  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
>  
>  libsfml-audio.so: $(OBJ) $(OBJVORBIS)
>diff -aurN sfml.orig/files/patch-src-SFML-Graphics-Makefile sfml/files/patch-src-SFML-Graphics-Makefile
>--- sfml.orig/files/patch-src-SFML-Graphics-Makefile	2011-07-21 13:43:36.552332915 +0200
>+++ sfml/files/patch-src-SFML-Graphics-Makefile	2011-07-21 14:25:28.508967627 +0200
>@@ -1,6 +1,16 @@
>---- src/SFML/Graphics/Makefile.orig	2010-01-27 17:00:05.000000000 +0300
>-+++ src/SFML/Graphics/Makefile	2010-08-25 07:07:23.000000000 +0400
>-@@ -26,14 +26,14 @@
>+--- src/SFML/Graphics/Makefile.orig	2010-01-27 15:00:05.000000000 +0100
>++++ src/SFML/Graphics/Makefile	2011-07-07 18:17:27.725542035 +0200
>+@@ -18,7 +18,8 @@
>+ else
>+     LIB     = libsfml-graphics.so
>+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
>+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
>++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
>++              && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
>+ endif
>+ 
>+ all: $(LIB)
>+@@ -26,14 +27,14 @@
>  libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
>  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
>  
>diff -aurN sfml.orig/files/patch-src-SFML-Makefile sfml/files/patch-src-SFML-Makefile
>--- sfml.orig/files/patch-src-SFML-Makefile	2011-07-21 13:43:36.553332763 +0200
>+++ sfml/files/patch-src-SFML-Makefile	2011-07-21 14:25:28.507968617 +0200
>@@ -1,6 +1,6 @@
>---- src/SFML/Makefile.orig	2010-01-27 17:00:37.000000000 +0300
>-+++ src/SFML/Makefile	2010-08-25 07:08:45.000000000 +0400
>-@@ -4,7 +4,7 @@
>+--- src/SFML/Makefile.orig	2010-01-27 15:00:37.000000000 +0100
>++++ src/SFML/Makefile	2011-07-07 18:04:51.328315292 +0200
>+@@ -4,7 +4,7 @@
>  ifeq ($(DEBUGBUILD), yes)
>      DEBUGFLAGS = -g -DDEBUG
>  else
>@@ -9,7 +9,7 @@
>  endif
>  
>  ifeq ($(STATIC), no)
>-@@ -15,11 +15,11 @@
>+@@ -15,21 +15,23 @@
>      LINKFLAGS  = 
>  endif
>  
>@@ -24,9 +24,12 @@
> +export CXXFLAGS   += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
> +export LDFLAGS    = -L${LOCALBASE}/lib $(LINKFLAGS)
>  export LIBPATH    = ../../../lib
>- export VERSION    = 1.6
>+-export VERSION    = 1.6
>++export MAJVERSION = 1
>++export MINVERSION = 6
>++export VERSION    = $(MAJVERSION).$(MINVERSION)
>  export CP         = cp
>-@@ -27,9 +27,9 @@
>+ export LN         = ln
>  export LNFLAGS    = -s -f
>  export AR         = ar
>  export ARFLAGS    = rcs
>diff -aurN sfml.orig/files/patch-src-SFML-Network-Makefile sfml/files/patch-src-SFML-Network-Makefile
>--- sfml.orig/files/patch-src-SFML-Network-Makefile	2011-07-21 13:43:36.551332509 +0200
>+++ sfml/files/patch-src-SFML-Network-Makefile	2011-07-21 14:25:28.507968617 +0200
>@@ -1,6 +1,16 @@
>---- src/SFML/Network/Makefile.orig	2009-05-28 19:57:08.000000000 +0400
>-+++ src/SFML/Network/Makefile	2009-07-07 20:01:13.000000000 +0400
>-@@ -17,10 +17,10 @@
>+--- src/SFML/Network/Makefile.orig	2010-01-27 15:00:37.000000000 +0100
>++++ src/SFML/Network/Makefile	2011-07-07 18:18:42.121053755 +0200
>+@@ -8,7 +8,8 @@
>+ else
>+     LIB     = libsfml-network.so
>+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
>+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
>++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
>++              && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
>+ endif
>+ 
>+ all: $(LIB)
>+@@ -17,10 +18,10 @@
>  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
>  
>  libsfml-network.so: $(OBJ)
>diff -aurN sfml.orig/files/patch-src-SFML-System-Makefile sfml/files/patch-src-SFML-System-Makefile
>--- sfml.orig/files/patch-src-SFML-System-Makefile	2011-07-21 13:43:36.552332915 +0200
>+++ sfml/files/patch-src-SFML-System-Makefile	2011-07-21 14:25:28.507968617 +0200
>@@ -1,6 +1,16 @@
>---- src/SFML/System/Makefile.orig	2009-05-28 19:57:04.000000000 +0400
>-+++ src/SFML/System/Makefile	2009-07-07 19:51:23.000000000 +0400
>-@@ -17,10 +17,10 @@
>+--- src/SFML/System/Makefile.orig	2010-01-27 15:00:23.000000000 +0100
>++++ src/SFML/System/Makefile	2011-07-07 18:19:35.964973862 +0200
>+@@ -8,7 +8,8 @@
>+ else
>+     LIB     = libsfml-system.so
>+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
>+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
>++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
>++              && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
>+ endif
>+ 
>+ all: $(LIB)
>+@@ -17,10 +18,10 @@
>  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
>  
>  libsfml-system.so: $(OBJ)
>diff -aurN sfml.orig/files/patch-src-SFML-Window-Makefile sfml/files/patch-src-SFML-Window-Makefile
>--- sfml.orig/files/patch-src-SFML-Window-Makefile	2011-07-21 13:43:36.552332915 +0200
>+++ sfml/files/patch-src-SFML-Window-Makefile	2011-07-21 14:25:28.507968617 +0200
>@@ -1,6 +1,16 @@
>---- src/SFML/Window/Makefile.orig	2009-05-28 19:57:08.000000000 +0400
>-+++ src/SFML/Window/Makefile	2009-07-07 19:51:46.000000000 +0400
>-@@ -18,10 +18,10 @@
>+--- src/SFML/Window/Makefile.orig	2010-01-27 15:00:37.000000000 +0100
>++++ src/SFML/Window/Makefile	2011-07-07 18:20:29.367023005 +0200
>+@@ -9,7 +9,8 @@
>+ else
>+     LIB     = libsfml-window.so
>+     LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
>+-    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
>++    INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) \
>++              && $(LN) $(LNFLAGS) $(DESTLIBDIR)/$(LIB).$(MAJVERSION) $(DESTLIBDIR)/$(LIB)
>+ endif
>+ 
>+ all: $(LIB)
>+@@ -18,10 +19,10 @@
>  	$(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
>  
>  libsfml-window.so: $(OBJ)
>diff -aurN sfml.orig/pkg-plist sfml/pkg-plist
>--- sfml.orig/pkg-plist	2011-07-21 13:43:36.568260358 +0200
>+++ sfml/pkg-plist	2011-07-21 14:24:59.421197254 +0200
>@@ -72,14 +72,19 @@
> include/SFML/Window/WindowSettings.hpp
> include/SFML/Window/WindowStyle.hpp
> lib/libsfml-audio.so
>+lib/libsfml-audio.so.1
> lib/libsfml-audio.so.1.6
> lib/libsfml-graphics.so
>+lib/libsfml-graphics.so.1
> lib/libsfml-graphics.so.1.6
> lib/libsfml-network.so
>+lib/libsfml-network.so.1
> lib/libsfml-network.so.1.6
> lib/libsfml-system.so
>+lib/libsfml-system.so.1
> lib/libsfml-system.so.1.6
> lib/libsfml-window.so
>+lib/libsfml-window.so.1
> lib/libsfml-window.so.1.6
> @dirrm include/SFML/Window
> @dirrm include/SFML/System/Win32

Actions: View | Diff

Attachments on bug 158721: 116727 | 116728