[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r10780: gar.lib.mk for git and other stuff
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r10780: gar.lib.mk for git and other stuff |
|
Date: |
Fri, 8 Nov 2024 22:49:11 -0500 (EST) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 10780
revision-id: carlhansen@gnu.org-20241109034903-3c8nlkss8fruhm0u
parent: carlhansen@gnu.org-20241109025801-4bxsnmcggu6gossm
committer: carlhansen@gnu.org
branch nick: trunk
timestamp: Sat 2024-11-09 03:49:03 +0000
message:
gar.lib.mk for git and other stuff
removed:
pkg/other/ffmpeg/files/ffmeg.7.0.1.SDL.patch
ffmeg.7.0.1.sdl.patc-20240615195120-rv1wcr6fuqdgpmxq-2
modified:
gar/gar.lib.mk gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
pkg/bio/beagle-lib/Makefile makefile-20160617200040-lqf8h520dfq0rtk7-46
pkg/gnome/cogl/Makefile makefile-20160617013746-7ygosxqw3lxxvo7f-383
pkg/gnome/jhbuild/Makefile makefile-20191112220205-kin3pedee9jc30er-3
pkg/gnu/g-golf/Makefile makefile-20201122032008-sn16ry9f2tc9wiez-3
pkg/gnu/gwl/Makefile makefile-20200217033920-chrsyzsxgzr7o4on-3
pkg/gnu/lsh/Makefile makefile-20160617014725-uokjfnggs70iry9h-1284
pkg/gnu/unifont/Makefile makefile-20161021200207-w6apucnpk66hw5ah-3
pkg/gnu/unrtf/Makefile makefile-20160617014725-uokjfnggs70iry9h-1937
pkg/gnu/webstump/Makefile makefile-20160617014725-uokjfnggs70iry9h-1993
pkg/other/ffmpeg/Makefile makefile-20180420222459-im2b99neezudny85-3
pkg/other/ffmpeg/sha256sums sha256sums-20180420222459-im2b99neezudny85-4
=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk 2024-08-07 18:11:56 +0000
+++ b/gar/gar.lib.mk 2024-11-09 03:49:03 +0000
@@ -187,14 +187,14 @@
# don't MAKECOOKIE I think
+#-d $(DOWNLOADDIRGIT)/$(GARNAME)/.git ]; problematic if name is something else
fetch-git:
@if [ -d $(DOWNLOADDIRGIT)/$(GARNAME)/.git ]; then $(MAKE) gitpull ;
else \
printf "git cloning and checking out $(GARNAME)\n"; \
mkdir -p $(DOWNLOADDIRGIT)/$(GARNAME); \
- cd $(DOWNLOADDIRGIT)/$(GARNAME) && git clone --depth=1
$(GIT_PATH) ; \
+ cd $(DOWNLOADDIRGIT) && git clone --depth=1 $(GIT_PATH) ; \
( cd $(GARNAME) && git checkout $(GIT_REVISION) ) ; fi
-# don't MAKECOOKIE I think
# almost same as above; this could be rewritten, using a variable for git
options....
fetch-gitrecursive:
@@ -206,6 +206,7 @@
# don't MAKECOOKIE I think
+
# paradigm:
#git clone $(GIT_PATH) $(GARNAME) &&
=== modified file 'pkg/bio/beagle-lib/Makefile'
--- a/pkg/bio/beagle-lib/Makefile 2024-10-06 04:03:58 +0000
+++ b/pkg/bio/beagle-lib/Makefile 2024-11-09 03:49:03 +0000
@@ -4,7 +4,6 @@
# This file is part of GSRC, the GNU Source Release Collection.
# http://www.gnu.org/software/gsrc
#
-#
# GSRC is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
@@ -17,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
-#
-#
+
+
# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
NAME = BEAGLE-lib
@@ -50,3 +49,6 @@
include config.mk
# FIXME installation of pkg-config/..pc should be pkgconfig...
+#
+#
+#
=== modified file 'pkg/gnome/cogl/Makefile'
--- a/pkg/gnome/cogl/Makefile 2022-09-05 04:27:38 +0000
+++ b/pkg/gnome/cogl/Makefile 2024-11-09 03:49:03 +0000
@@ -24,7 +24,6 @@
HOME_URL = http://www.gnome.org/
DESCRIPTION = A hardware accelerated 3D graphics API
define BLURB
-
endef
######################################################################
@@ -44,6 +43,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
=== modified file 'pkg/gnome/jhbuild/Makefile'
--- a/pkg/gnome/jhbuild/Makefile 2020-10-05 07:49:08 +0000
+++ b/pkg/gnome/jhbuild/Makefile 2024-11-09 03:49:03 +0000
@@ -21,10 +21,9 @@
NAME = jhbuild
GARNAME = jhbuild
GARVERSION = 3.38.0
-HOME_URL = http://www.gnome.org/
-DESCRIPTION = utility for building from source
+HOME_URL = https://gnome.pages.gitlab.gnome.org/jhbuild/
+DESCRIPTION = utility for getting and building from source
define BLURB
-
endef
######################################################################
@@ -44,6 +43,8 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
+# todo git version
+
=== modified file 'pkg/gnu/g-golf/Makefile'
--- a/pkg/gnu/g-golf/Makefile 2024-04-12 07:09:08 +0000
+++ b/pkg/gnu/g-golf/Makefile 2024-11-09 03:49:03 +0000
@@ -15,14 +15,15 @@
#
# You should have received a copy of the GNU General Public License
# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
-#
+
# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
+
NAME = GNU G-Golf
GARNAME = g-golf
GARVERSION = master
HOME_URL = https://www.gnu.org/software/g-golf
-DESCRIPTION = GNU G-Golf is for GNOME, a Guile Object Library For
+DESCRIPTION = GNU G-Golf is Guile Object Library For GNOME
define BLURB
G-Golf is a Guile Object Library for GNOME. G-Golf low level API
comprises a binding to (most of) the GObject Introspection and (some of)
=== modified file 'pkg/gnu/gwl/Makefile'
--- a/pkg/gnu/gwl/Makefile 2022-11-13 20:47:53 +0000
+++ b/pkg/gnu/gwl/Makefile 2024-11-09 03:49:03 +0000
@@ -39,13 +39,15 @@
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-BUILDDEPS =
+BUILDDEPS = guile
LIBDEPS =
- # needs wisp
+ # needs wisp and other guile packages...
######################################################################
INSTALL_SCRIPTS = $(INSTALL_TARGETS) info
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
+
+
=== modified file 'pkg/gnu/lsh/Makefile'
--- a/pkg/gnu/lsh/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/lsh/Makefile 2024-11-09 03:49:03 +0000
@@ -40,6 +40,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include ../../../gar/gar.lib/info.mk
include config.mk
=== modified file 'pkg/gnu/unifont/Makefile'
--- a/pkg/gnu/unifont/Makefile 2024-09-11 17:04:26 +0000
+++ b/pkg/gnu/unifont/Makefile 2024-11-09 03:49:03 +0000
@@ -37,6 +37,7 @@
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
BUILDDEPS =
+# perl modules GD
LIBDEPS =
CONFIGURE_SCRIPTS =
=== modified file 'pkg/gnu/unrtf/Makefile'
--- a/pkg/gnu/unrtf/Makefile 2024-05-01 01:43:20 +0000
+++ b/pkg/gnu/unrtf/Makefile 2024-11-09 03:49:03 +0000
@@ -44,5 +44,6 @@
######################################################################
-include ../../../gar/gar.lib/auto.mk
+include ../../../gar/gar.lib/autotools.mk
include config.mk
+
=== modified file 'pkg/gnu/webstump/Makefile'
--- a/pkg/gnu/webstump/Makefile 2021-04-25 06:14:45 +0000
+++ b/pkg/gnu/webstump/Makefile 2024-11-09 03:49:03 +0000
@@ -32,6 +32,8 @@
DISTFILES = $(GARNAME).tar.gz
SIGFILES =
WORKSRC = $(WORKDIR)/$(GARNAME)
+WORKOBJ = $(WORKDIR)/$(GARNAME)
+
BUILD_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = www
=== modified file 'pkg/other/ffmpeg/Makefile'
--- a/pkg/other/ffmpeg/Makefile 2024-10-23 06:56:43 +0000
+++ b/pkg/other/ffmpeg/Makefile 2024-11-09 03:49:03 +0000
@@ -32,10 +32,12 @@
BUILDDEPS = libsdl2
LIBDEPS =
-PATCHFILES = ffmeg.7.0.1.SDL.patch
+PATCHFILES = ffmeg.7.1.SDL.patch
######################################################################
include ../../../gar/gar.lib/autotools.mk
include config.mk
+BUILD_ARGS = CFLAGS=-fPIC
+
=== removed file 'pkg/other/ffmpeg/files/ffmeg.7.0.1.SDL.patch'
--- a/pkg/other/ffmpeg/files/ffmeg.7.0.1.SDL.patch 2024-06-15 19:54:14
+0000
+++ b/pkg/other/ffmpeg/files/ffmeg.7.0.1.SDL.patch 1970-01-01 00:00:00
+0000
@@ -1,28 +0,0 @@
-7iff -x config.log -x config.status -ru tmp/ffmpeg-7.1/fftools/ffplay.c
work/ffmpeg-6.1/fftools/ffplay.c
---- tmp/ffmpeg-6.1/fftools/ffplay.c 2023-11-10 16:25:17.000000000 -0800
-+++ work/ffmpeg-6.1/fftools/ffplay.c 2023-11-28 22:47:34.351287524 -0800
-@@ -54,8 +54,8 @@
- #include "libavfilter/buffersink.h"
- #include "libavfilter/buffersrc.h"
-
--#include <SDL.h>
--#include <SDL_thread.h>
-+#include <SDL2/SDL.h>
-+#include <SDL2/SDL_thread.h>
-
- #include "cmdutils.h"
- #include "opt_common.h"
-diff -x config.log -x config.status -ru tmp/ffmpeg-6.1/libavdevice/sdl2.c
work/ffmpeg-6.1/libavdevice/sdl2.c
---- tmp/ffmpeg-6.1/libavdevice/sdl2.c 2023-11-09 16:30:16.000000000 -0800
-+++ work/ffmpeg-6.1/libavdevice/sdl2.c 2023-11-28 22:45:57.483728190 -0800
-@@ -23,8 +23,8 @@
- * libSDL2 output device
- */
-
--#include <SDL.h>
--#include <SDL_thread.h>
-+#include <SDL2/SDL.h>
-+#include <SDL2/SDL_thread.h>
-
- #include "libavutil/avstring.h"
- #include "libavutil/imgutils.h"
=== modified file 'pkg/other/ffmpeg/sha256sums'
--- a/pkg/other/ffmpeg/sha256sums 2024-10-23 06:56:43 +0000
+++ b/pkg/other/ffmpeg/sha256sums 2024-11-09 03:49:03 +0000
@@ -1,2 +1,2 @@
fd59e6160476095082e94150ada5a6032d7dcc282fe38ce682a00c18e7820528
download/ffmpeg-7.1.tar.bz2
-bf6fe64622e70815d6cddc09a40ff6ad58fc20bbb9675fc61735d6c10c60f996
download/ffmeg.7.0.1.SDL.patch
+bf6fe64622e70815d6cddc09a40ff6ad58fc20bbb9675fc61735d6c10c60f996
download/ffmeg.7.1.SDL.patch
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r10780: gar.lib.mk for git and other stuff,
Carl Hansen <=