Author: krejzi
Date: Tue Jul 2 06:24:15 2013
New Revision: 2654
Log:
Add patches for newly upgraded packages.
Added:
trunk/MesaLib/MesaLib-9.1.4-add_xdemos-1.patch (contents, props changed)
trunk/MesaLib/MesaLib-9.1.4-llvm_fixes-1.patch
trunk/nss/nss-3.15-standalone-1.patch
trunk/xorg-server/xorg-server-1.14.2-add_prime_support-1.patch (contents,
props changed)
Added: trunk/MesaLib/MesaLib-9.1.4-add_xdemos-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/MesaLib/MesaLib-9.1.4-add_xdemos-1.patch Tue Jul 2 06:24:15
2013 (r2654)
@@ -0,0 +1 @@
+link MesaLib-9.1-add_xdemos-1.patch
\ No newline at end of file
Added: trunk/MesaLib/MesaLib-9.1.4-llvm_fixes-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/MesaLib/MesaLib-9.1.4-llvm_fixes-1.patch Tue Jul 2 06:24:15
2013 (r2654)
@@ -0,0 +1,72 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2013-07-02
+Initial Package Version: 9.1.4
+Upstream Status: Fixed upstream
+Origin: Upstream
+Description: Fixes building with LLVM 3.3.
+
+--- a/src/gallium/drivers/r600/llvm_wrapper.cpp 2013-03-05
23:54:28.000000000 +0100
++++ b/src/gallium/drivers/r600/llvm_wrapper.cpp 2013-07-02
12:58:39.294793737 +0200
+@@ -1,8 +1,16 @@
+ #include <llvm/ADT/OwningPtr.h>
+ #include <llvm/ADT/StringRef.h>
++#if HAVE_LLVM < 0x0303
+ #include <llvm/LLVMContext.h>
+-#include <llvm/PassManager.h>
+ #include <llvm/Support/IRReader.h>
++#else
++#include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/DataLayout.h>
++#include <llvm/IRReader/IRReader.h>
++#endif
++#include <llvm/PassManager.h>
+ #include <llvm/Support/MemoryBuffer.h>
+ #include <llvm/Support/SourceMgr.h>
+ #include <llvm/Transforms/IPO.h>
+--- a/src/gallium/drivers/r600/Makefile.am 2013-03-05 23:54:28.000000000
+0100
++++ b/src/gallium/drivers/r600/Makefile.am 2013-07-02 12:58:39.294793737
+0200
+@@ -26,7 +26,8 @@
+ -I$(top_srcdir)/src/gallium/drivers/radeon/
+
+ AM_CXXFLAGS= \
+- $(LLVM_CXXFLAGS)
++ $(LLVM_CXXFLAGS) \
++ $(DEFINES)
+ endif
+
+ if USE_R600_LLVM_COMPILER
+--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-06-25
23:24:55.000000000 +0200
++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-07-02
12:58:39.294793737 +0200
+@@ -25,13 +25,21 @@
+ */
+ #include "radeon_llvm_emit.h"
+
++#if HAVE_LLVM < 0x0303
+ #include <llvm/LLVMContext.h>
+ #include <llvm/Module.h>
++#include <llvm/DataLayout.h>
++#else
++#include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/DataLayout.h>
++#include <llvm/Support/CBindingWrapping.h>
++#endif
++
+ #include <llvm/PassManager.h>
+ #include <llvm/ADT/Triple.h>
+ #include <llvm/Support/FormattedStream.h>
+ #include <llvm/Support/Host.h>
+-#include <llvm/Support/IRReader.h>
+ #include <llvm/Support/SourceMgr.h>
+ #include <llvm/Support/TargetRegistry.h>
+ #include <llvm/Support/TargetSelect.h>
+@@ -39,7 +47,6 @@
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Transforms/Scalar.h>
+ #include <llvm-c/Target.h>
+-#include <llvm/DataLayout.h>
+
+ #include <iostream>
+ #include <stdlib.h>
Added: trunk/nss/nss-3.15-standalone-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/nss/nss-3.15-standalone-1.patch Tue Jul 2 06:24:15 2013
(r2654)
@@ -0,0 +1,241 @@
+Submitted By: Armin K. <krejzi at email dot com>
+Date: 2013-06-02
+Initial Package Version: 3.15
+Upstream Status: Not applicable
+Origin: Based on dj's original patch, rediffed for 3.15
+Description: Adds auto-generated nss.pc and nss-config script, and
allows
+ building without nspr in the source tree.
+
+--- a/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/Makefile 2013-07-02 14:41:34.864754640 +0200
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ../..
++DEPTH = ../..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+--- a/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss-config.in 2013-07-02 14:41:34.864754640 +0200
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++prefix=@prefix@
++
++major_version=@NSS_MAJOR_VERSION@
++minor_version=@NSS_MINOR_VERSION@
++patch_version=@NSS_PATCH_VERSION@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ nssutil
++ smime
++ ssl
++ softokn
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ softokn)
++ lib_softokn=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-L$libdir"
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+--- a/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ b/nss/config/nss.pc.in 2013-07-02 14:41:34.868088133 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@
-lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
++Cflags: -I${includedir}
++
+--- a/nss/Makefile 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/Makefile 2013-07-02 14:42:55.691421728 +0200
+@@ -44,7 +44,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_nspr all
++nss_build_all: all
+
+ nss_clean_all: clobber_nspr clobber
+
+--- a/nss/manifest.mn 2013-05-28 23:43:24.000000000 +0200
++++ b/nss/manifest.mn 2013-07-02 14:42:26.014754938 +0200
+@@ -10,4 +10,4 @@
+
+ RELEASE = nss
+
+-DIRS = coreconf lib cmd
++DIRS = coreconf lib cmd config
Added: trunk/xorg-server/xorg-server-1.14.2-add_prime_support-1.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xorg-server/xorg-server-1.14.2-add_prime_support-1.patch Tue Jul
2 06:24:15 2013 (r2654)
@@ -0,0 +1 @@
+link xorg-server-1.13.1-add_prime_support-1.patch
\ No newline at end of file
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
